Skip to content

Commit cffdaa6

Browse files
David Kozubgregkh
authored andcommitted
clockevents/drivers/cs5535: Improve resilience to spurious interrupts
commit eb39a7c0355393c5a8d930f342ad7a6231b552c4 upstream. 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. Fixes: 8f9327c ("clockevents/drivers/cs5535: Migrate to new 'set-state' interface") Suggested-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David Kozub <zub@linux.fjfi.cvut.cz> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lkml.kernel.org/r/20171020093103.3317F6004D@linux.fjfi.cvut.cz Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b178c94 commit cffdaa6

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/clocksource/cs5535-clockevt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)
117117
/* Turn off the clock (and clear the event) */
118118
disable_timer(cs5535_event_clock);
119119

120-
if (clockevent_state_shutdown(&cs5535_clockevent))
120+
if (clockevent_state_detached(&cs5535_clockevent) ||
121+
clockevent_state_shutdown(&cs5535_clockevent))
121122
return IRQ_HANDLED;
122123

123124
/* Clear the counter */

0 commit comments

Comments
 (0)