diff options
| author | Yongbae Park <yongbae2@gmail.com> | 2015-03-03 19:46:49 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-13 14:02:59 +0200 |
| commit | c75a45eba48c9cde17c1041db76ba1f7596049f8 (patch) | |
| tree | 1403a93d1eb86c7925adee3ac97b282f5a960e47 | |
| parent | 0825465c936bcb8feba95d8b40f86dbd716b6623 (diff) | |
| download | lwn-c75a45eba48c9cde17c1041db76ba1f7596049f8.tar.gz lwn-c75a45eba48c9cde17c1041db76ba1f7596049f8.zip | |
clocksource: efm32: Fix a NULL pointer dereference
commit 7b8f10da3bf1056546133c9f54f49ce389fd95ab upstream.
The initialisation of the efm32 clocksource first sets up the irq and only
after that initialises the data needed for irq handling. In case this
initialisation is delayed the irq handler would dereference a NULL pointer.
I'm not aware of anything that could delay the process in such a way, but it's
better to be safe than sorry, so setup the irq only when the clock event device
is ready.
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Yongbae Park <yongbae2@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/clocksource/time-efm32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/time-efm32.c b/drivers/clocksource/time-efm32.c index 1a6205b7bed3..35b016100673 100644 --- a/drivers/clocksource/time-efm32.c +++ b/drivers/clocksource/time-efm32.c @@ -225,12 +225,12 @@ static int __init efm32_clockevent_init(struct device_node *np) clock_event_ddata.base = base; clock_event_ddata.periodic_top = DIV_ROUND_CLOSEST(rate, 1024 * HZ); - setup_irq(irq, &efm32_clock_event_irq); - clockevents_config_and_register(&clock_event_ddata.evtdev, DIV_ROUND_CLOSEST(rate, 1024), 0xf, 0xffff); + setup_irq(irq, &efm32_clock_event_irq); + return 0; err_get_irq: |