[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-36f34c8c63da3e272fd66f91089228c22d2b6e8b@git.kernel.org>
Date: Sat, 16 Jan 2016 13:16:35 -0800
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: jmmahler@...il.com, joe.lawrence@...atus.com, tglx@...utronix.de,
jiang.liu@...ux.intel.com, linux-kernel@...r.kernel.org,
linux@...ck-us.net, bp@...en8.de, mingo@...nel.org, hpa@...or.com
Subject: [tip:x86/urgent] x86/irq:
Validate that irq descriptor is still active
Commit-ID: 36f34c8c63da3e272fd66f91089228c22d2b6e8b
Gitweb: http://git.kernel.org/tip/36f34c8c63da3e272fd66f91089228c22d2b6e8b
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Thu, 31 Dec 2015 16:30:45 +0000
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 15 Jan 2016 13:43:59 +0100
x86/irq: Validate that irq descriptor is still active
In fixup_irqs() we unconditionally dereference the irq chip of an irq
descriptor. The descriptor might still be valid, but already cleaned up,
i.e. the chip removed. Add a check for this condition.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Jiang Liu <jiang.liu@...ux.intel.com>
Cc: Joe Lawrence <joe.lawrence@...atus.com>
Cc: Jeremiah Mahler <jmmahler@...il.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: andy.shevchenko@...il.com
Cc: Guenter Roeck <linux@...ck-us.net>
Cc: stable@...r.kernel.org #4.3+
Link: http://lkml.kernel.org/r/20151231160106.236423282@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/x86/kernel/irq.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index f8062aa..c0b58dd 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -470,6 +470,15 @@ void fixup_irqs(void)
}
chip = irq_data_get_irq_chip(data);
+ /*
+ * The interrupt descriptor might have been cleaned up
+ * already, but it is not yet removed from the radix tree
+ */
+ if (!chip) {
+ raw_spin_unlock(&desc->lock);
+ continue;
+ }
+
if (!irqd_can_move_in_process_context(data) && chip->irq_mask)
chip->irq_mask(data);
Powered by blists - more mailing lists