commit: 2c4f57d12df7696d65b0247bfd57fd082a7719e6 From: Thomas Gleixner <[email protected]> Date: Tue, 26 Jul 2011 16:08:18 -0700 Subject: [PATCH] rtc: handle errors correctly in rtc_irq_set_state()
The code checks the correctness of the parameters, but unconditionally arms/disarms the hrtimer. The result is that a random task might arm/disarm rtc timer and surprise the real owner by either generating events or by stopping them. Signed-off-by: Thomas Gleixner <[email protected]> Cc: John Stultz <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Ben Greear <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> --- drivers/rtc/interface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index df68618..b6bf57f 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -656,6 +656,8 @@ int rtc_irq_set_state(struct rtc_device *rtc, struct rtc_task *task, int enabled err = -EBUSY; if (rtc->irq_task != task) err = -EACCES; + if (err) + goto out; if (enabled) { ktime_t period = ktime_set(0, NSEC_PER_SEC/rtc->irq_freq); @@ -664,6 +666,7 @@ int rtc_irq_set_state(struct rtc_device *rtc, struct rtc_task *task, int enabled hrtimer_cancel(&rtc->pie_timer); } rtc->pie_enabled = enabled; +out: spin_unlock_irqrestore(&rtc->irq_task_lock, flags); return err; _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
