diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-21 15:00:34 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-25 05:57:57 -0400 |
commit | 08ece35e7dcc24591e27089029f1fea14e76d1fa (patch) | |
tree | 6228d8398ec97fc77d868b098c42590d493a8d5a /arch/mips/ath25/ar5312.c | |
parent | 20f83e717f287fd13fd85359624f10f3206bd34d (diff) |
MIPS/ath25: 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: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Cc: linux-mips@linux-mips.org
Diffstat (limited to 'arch/mips/ath25/ar5312.c')
-rw-r--r-- | arch/mips/ath25/ar5312.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/ath25/ar5312.c b/arch/mips/ath25/ar5312.c index b6887f75144c..fd6c9119461d 100644 --- a/arch/mips/ath25/ar5312.c +++ b/arch/mips/ath25/ar5312.c | |||
@@ -156,8 +156,8 @@ void __init ar5312_arch_init_irq(void) | |||
156 | irq = irq_create_mapping(domain, AR5312_MISC_IRQ_AHB_PROC); | 156 | irq = irq_create_mapping(domain, AR5312_MISC_IRQ_AHB_PROC); |
157 | setup_irq(irq, &ar5312_ahb_err_interrupt); | 157 | setup_irq(irq, &ar5312_ahb_err_interrupt); |
158 | 158 | ||
159 | irq_set_chained_handler(AR5312_IRQ_MISC, ar5312_misc_irq_handler); | 159 | irq_set_chained_handler_and_data(AR5312_IRQ_MISC, |
160 | irq_set_handler_data(AR5312_IRQ_MISC, domain); | 160 | ar5312_misc_irq_handler, domain); |
161 | 161 | ||
162 | ar5312_misc_irq_domain = domain; | 162 | ar5312_misc_irq_domain = domain; |
163 | } | 163 | } |