diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-22 09:12:50 +0000 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-07-26 14:49:57 -0700 |
| commit | 53cc2820acbdbcc768675bfaff321f3a8680a317 (patch) | |
| tree | b0070f1ace60aeed05a30000f277ac9cd29e222a /drivers/rtc | |
| parent | ef68c8f87ed13f65df867dddf36c0e185b27b942 (diff) | |
| download | op-kernel-dev-53cc2820acbdbcc768675bfaff321f3a8680a317.zip op-kernel-dev-53cc2820acbdbcc768675bfaff321f3a8680a317.tar.gz | |
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')
| -rw-r--r-- | 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; |
