diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-21 15:00:43 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-25 05:58:01 -0400 |
commit | 5c1642e4d2e475bbfb13da15c6ca16a23ba889bb (patch) | |
tree | f0d146b47857c6da121efc1a123c9b15a1ecfffd | |
parent | 746ad9a7a1fef789a9f579441b4a7b686fa85aa2 (diff) |
MIPS/ralink: 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: Ralf Baechle <ralf@linux-mips.org>
Cc: Qais Yousef <qais.yousef@imgtec.com>
Cc: Andrew Bresticker <abrestic@chromium.org>
Cc: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
-rw-r--r-- | arch/mips/ralink/irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c index 7cf91b92e9d1..f0442990aa35 100644 --- a/arch/mips/ralink/irq.c +++ b/arch/mips/ralink/irq.c | |||
@@ -184,8 +184,7 @@ static int __init intc_of_init(struct device_node *node, | |||
184 | 184 | ||
185 | rt_intc_w32(INTC_INT_GLOBAL, INTC_REG_ENABLE); | 185 | rt_intc_w32(INTC_INT_GLOBAL, INTC_REG_ENABLE); |
186 | 186 | ||
187 | irq_set_chained_handler(irq, ralink_intc_irq_handler); | 187 | irq_set_chained_handler_and_data(irq, ralink_intc_irq_handler, domain); |
188 | irq_set_handler_data(irq, domain); | ||
189 | 188 | ||
190 | /* tell the kernel which irq is used for performance monitoring */ | 189 | /* tell the kernel which irq is used for performance monitoring */ |
191 | rt_perfcount_irq = irq_create_mapping(domain, 9); | 190 | rt_perfcount_irq = irq_create_mapping(domain, 9); |