diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-21 14:16:05 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-25 05:56:48 -0400 |
commit | 6218b88d2678523cc2f6f8e3ea1182c250d9684f (patch) | |
tree | 522e86cc003144dda8ac955d6b15cfe4efbb909c /drivers/gpio/gpio-dwapb.c | |
parent | b34cc62084e8c44f7c85e95bfc19e21d07f25173 (diff) |
gpio/dwapb: Fix race in installing chained IRQ handler
Fix a race where a pending interrupt could be received and the handler
called before the handler's data has been setup, by converting to
irq_set_chained_handler_and_data().
Search and conversion was done with coccinelle:
@@
expression E1, E2, E3;
@@
(
-if (irq_set_chained_handler(E1, E3) != 0)
- BUG();
|
-irq_set_chained_handler(E1, E3);
)
-irq_set_handler_data(E1, E2);
+irq_set_chained_handler_and_data(E1, E3, E2);
@@
expression E1, E2, E3;
@@
(
-if (irq_set_chained_handler(E1, E3) != 0)
- BUG();
...
|
-irq_set_chained_handler(E1, E3);
...
)
-irq_set_handler_data(E1, E2);
+irq_set_chained_handler_and_data(E1, E3, E2);
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: linux-gpio@vger.kernel.org
Diffstat (limited to 'drivers/gpio/gpio-dwapb.c')
-rw-r--r-- | drivers/gpio/gpio-dwapb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c index 58faf04fce5d..55fa9853a7f2 100644 --- a/drivers/gpio/gpio-dwapb.c +++ b/drivers/gpio/gpio-dwapb.c | |||
@@ -348,8 +348,8 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio, | |||
348 | irq_gc->chip_types[1].handler = handle_edge_irq; | 348 | irq_gc->chip_types[1].handler = handle_edge_irq; |
349 | 349 | ||
350 | if (!pp->irq_shared) { | 350 | if (!pp->irq_shared) { |
351 | irq_set_chained_handler(pp->irq, dwapb_irq_handler); | 351 | irq_set_chained_handler_and_data(pp->irq, dwapb_irq_handler, |
352 | irq_set_handler_data(pp->irq, gpio); | 352 | gpio); |
353 | } else { | 353 | } else { |
354 | /* | 354 | /* |
355 | * Request a shared IRQ since where MFD would have devices | 355 | * Request a shared IRQ since where MFD would have devices |