]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
pinctrl/st: Fix race in installing chained IRQ handler
authorThomas Gleixner <tglx@linutronix.de>
Sun, 21 Jun 2015 18:16:15 +0000 (20:16 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 25 Jun 2015 09:57:09 +0000 (11:57 +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: Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
Cc: Maxime Coquelin <maxime.coquelin@st.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: kernel@stlinux.com
Cc: linux-gpio@vger.kernel.org
drivers/pinctrl/pinctrl-st.c

index 65bf73b70e3406c72db02f796840fa6296bbdcb9..10e9c4e8e81687829da3e5ffbb812ef4ed3b2b5c 100644 (file)
@@ -1661,8 +1661,8 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
                if (IS_ERR(info->irqmux_base))
                        return PTR_ERR(info->irqmux_base);
 
-               irq_set_chained_handler(irq, st_gpio_irqmux_handler);
-               irq_set_handler_data(irq, info);
+               irq_set_chained_handler_and_data(irq, st_gpio_irqmux_handler,
+                                                info);
 
        }