clockevents/drivers/cs5535: improve resilience to spurious interrupts
PATCH v2 1/1 clockevents/drivers/cs5535: improve resilience to spurious interrupts
The interrupt handler mfgpt_tick() is not robust versus spurious interrupts which happen before the clock event device is registered and fully initialized.
The reason is that the safe guard against spurious interrupts solely checks for the clockevents shutdown state, but lacks a check for detached state. If the interrupt hits while the device is in detached state it passes the safe guard and dereferences the event handler call back which is NULL.
Add the missing state check.
---
Changes in v2:
- Use commit message suggested by Thomas Gleixner
- Fix formatting of multi-line if condition
drivers/clocksource/cs5535-clockevt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clocksource/cs5535-clockevt.c +2 -1
@@ -117,7 +117,8 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)/* Turn off the clock (and clear the event) */ disable_timer (cs5535_event_clock); -if (clockevent_state_shutdown (&cs5535_clockevent)) +if (clockevent_state_detached (&cs5535_clockevent) || +clockevent_state_shutdown (&cs5535_clockevent))return IRQ_HANDLED ;/* Clear the counter */
Signature · 1 line
2.14.2
tip-bot for David Kozub
merge bot[tip:timers/urgent] clockevents/drivers/cs5535: Improve resilience to spurious interrupts
clockevents/drivers/cs5535: Improve resilience to spurious interrupts
Commit-ID: eb39a7c0355393c5a8d930f342ad7a6231b552c4 Gitweb: https://git.kernel.org/tip/eb39a7c0355393c5a8d930f342ad7a6231b552c4 Author: David Kozub <[email protected]> AuthorDate: Thu, 19 Oct 2017 22:57:02 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 20 Oct 2017 13:41:52 +0200
clockevents/drivers/cs5535: Improve resilience to spurious interrupts
The interrupt handler mfgpt_tick() is not robust versus spurious interrupts which happen before the clock event device is registered and fully initialized.
The reason is that the safe guard against spurious interrupts solely checks for the clockevents shutdown state, but lacks a check for detached state. If the interrupt hits while the device is in detached state it passes the safe guard and dereferences the event handler call back which is NULL.
Add the missing state check.
--- drivers/clocksource/cs5535-clockevt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clocksource/cs5535-clockevt.c +2 -1
@@ -117,7 +117,8 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)/* Turn off the clock (and clear the event) */ disable_timer (cs5535_event_clock); -if (clockevent_state_shutdown (&cs5535_clockevent)) +if (clockevent_state_detached (&cs5535_clockevent) || +clockevent_state_shutdown (&cs5535_clockevent))return IRQ_HANDLED ;/* Clear the counter */