]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
avr32/at32ap: Fix race in installing chained IRQ handler
authorThomas Gleixner <tglx@linutronix.de>
Sun, 21 Jun 2015 19:00:29 +0000 (21:00 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 25 Jun 2015 09:57:52 +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: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
arch/avr32/mach-at32ap/extint.c

index cfb298d6630582b6924824a6b7bd4aed4663d526..2d48b6a461664e5fd03d775cc4ba922dd56dacf7 100644 (file)
@@ -231,8 +231,7 @@ static int __init eic_probe(struct platform_device *pdev)
                irq_set_chip_data(eic->first_irq + i, eic);
        }
 
-       irq_set_chained_handler(int_irq, demux_eic_irq);
-       irq_set_handler_data(int_irq, eic);
+       irq_set_chained_handler_and_data(int_irq, demux_eic_irq, eic);
 
        if (pdev->id == 0) {
                nmi_eic = eic;