Skip to content

Commit

Permalink
sh/intc: Fix potential race in installing chained IRQ handler
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Thomas Gleixner committed Jun 25, 2015
1 parent ef80e87 commit beab99f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/sh/intc/virq.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,9 @@ static void __init intc_subgroup_map(struct intc_desc_int *d)
*/
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);
Expand Down

0 comments on commit beab99f

Please sign in to comment.