summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-06-22 11:31:34 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-06-25 11:57:19 +0200
commitbeab99fe835be1d9ef1112dabdae3aa417126430 (patch)
tree2353ffbdadfac7e4d9c2a96a6f81fffcdd5587ed /drivers/sh
parentef80e87d20d115eaee15da666f1a3551328205bb (diff)
sh/intc: Fix potential 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 moving the call to irq_set_chained_handler() after the function which sets up the handler data. Found by code inspection. Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Simon Horman <horms@verge.net.au> Cc: Magnus Damm <magnus.damm@gmail.com> Cc: linux-sh@vger.kernel.org
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/intc/virq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c
index f30ac9354ff2..f5f1b821241a 100644
--- a/drivers/sh/intc/virq.c
+++ b/drivers/sh/intc/virq.c
@@ -243,8 +243,9 @@ restart:
*/
irq_set_nothread(irq);
- irq_set_chained_handler(entry->pirq, intc_virq_handler);
+ /* Set handler data before installing the handler */
add_virq_to_pirq(entry->pirq, irq);
+ irq_set_chained_handler(entry->pirq, intc_virq_handler);
radix_tree_tag_clear(&d->tree, entry->enum_id,
INTC_TAG_VIRQ_NEEDS_ALLOC);