aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc/interface.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-22 05:12:50 -0400
committerJohn Stultz <john.stultz@linaro.org>2011-07-26 17:49:57 -0400
commit53cc2820acbdbcc768675bfaff321f3a8680a317 (patch)
treeb0070f1ace60aeed05a30000f277ac9cd29e222a /drivers/rtc/interface.c
parentef68c8f87ed13f65df867dddf36c0e185b27b942 (diff)
rtc: Handle errors correctly in rtc_irq_set_state()
In rtc_irq_set_state, the code checks the correctness of the parameters, but then goes on to unconditionally arms/disarms the hrtimer. Thus a random task might arm/disarm rtc timer and surprise the real owner by either generating events or by stopping them. Cc: stable@kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/rtc/interface.c')
-rw-r--r--drivers/rtc/interface.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index df68618f6dbb..b6bf57f25cc9 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
656 err = -EBUSY; 656 err = -EBUSY;
657 if (rtc->irq_task != task) 657 if (rtc->irq_task != task)
658 err = -EACCES; 658 err = -EACCES;
659 if (err)
660 goto out;
659 661
660 if (enabled) { 662 if (enabled) {
661 ktime_t period = ktime_set(0, NSEC_PER_SEC/rtc->irq_freq); 663 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
664 hrtimer_cancel(&rtc->pie_timer); 666 hrtimer_cancel(&rtc->pie_timer);
665 } 667 }
666 rtc->pie_enabled = enabled; 668 rtc->pie_enabled = enabled;
669out:
667 spin_unlock_irqrestore(&rtc->irq_task_lock, flags); 670 spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
668 671
669 return err; 672 return err;