]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
gpio/bcm-kona: Fix race in installing chained IRQ handler
authorThomas Gleixner <tglx@linutronix.de>
Sun, 21 Jun 2015 18:16:04 +0000 (20:16 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 25 Jun 2015 09:56:45 +0000 (11:56 +0200)
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: Ray Jui <rjui@broadcom.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-gpio@vger.kernel.org
drivers/gpio/gpio-bcm-kona.c

index b164ce837b43fbd9f9ddda6ed93353d66ac33d45..fc214c3dfcc4df2b74fa449dd3ce287126fcdd86 100644 (file)
@@ -651,8 +651,9 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)
        }
        for (i = 0; i < kona_gpio->num_bank; i++) {
                bank = &kona_gpio->banks[i];
-               irq_set_chained_handler(bank->irq, bcm_kona_gpio_irq_handler);
-               irq_set_handler_data(bank->irq, bank);
+               irq_set_chained_handler_and_data(bank->irq,
+                                                bcm_kona_gpio_irq_handler,
+                                                bank);
        }
 
        spin_lock_init(&kona_gpio->lock);