diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-16 14:10:17 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-08-10 09:54:22 +0100 |
| commit | 605cb392a3d2016cb2497e937acd7616ef2b9eb6 (patch) | |
| tree | 8278f0226d7bf49ed5c42456df83537c1aae5c3e /kernel | |
| parent | fd6139cf4a55d889063c3894938bf672511c6ef5 (diff) | |
| download | linux-stable-605cb392a3d2016cb2497e937acd7616ef2b9eb6.tar.gz linux-stable-605cb392a3d2016cb2497e937acd7616ef2b9eb6.tar.bz2 linux-stable-605cb392a3d2016cb2497e937acd7616ef2b9eb6.zip | |
genirq: Prevent resend to interrupts marked IRQ_NESTED_THREAD
commit 75a06189fc508a2acf470b0b12710362ffb2c4b1 upstream.
The resend mechanism happily calls the interrupt handler of interrupts
which are marked IRQ_NESTED_THREAD from softirq context. This can
result in crashes because the interrupt handler is not the proper way
to invoke the device handlers. They must be invoked via
handle_nested_irq.
Prevent the resend even if the interrupt has no valid parent irq
set. Its better to have a lost interrupt than a crashing machine.
Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/resend.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c index 9065107f083e..7a5237a1bce5 100644 --- a/kernel/irq/resend.c +++ b/kernel/irq/resend.c @@ -75,13 +75,21 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq) !desc->irq_data.chip->irq_retrigger(&desc->irq_data)) { #ifdef CONFIG_HARDIRQS_SW_RESEND /* - * If the interrupt has a parent irq and runs - * in the thread context of the parent irq, - * retrigger the parent. + * If the interrupt is running in the thread + * context of the parent irq we need to be + * careful, because we cannot trigger it + * directly. */ - if (desc->parent_irq && - irq_settings_is_nested_thread(desc)) + if (irq_settings_is_nested_thread(desc)) { + /* + * If the parent_irq is valid, we + * retrigger the parent, otherwise we + * do nothing. + */ + if (!desc->parent_irq) + return; irq = desc->parent_irq; + } /* Set it pending and activate the softirq: */ set_bit(irq, irqs_resend); tasklet_schedule(&resend_tasklet); |