[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-7b79462a20826a7269322113c68ca78d5f67c0bd@git.kernel.org>
Date: Sat, 30 Oct 2010 08:36:54 GMT
From: tip-bot for Yinghai Lu <yinghai@...nel.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, rja@....com, hpa@...or.com,
mingo@...hat.com, yinghai@...nel.org, suresh.b.siddha@...el.com,
tglx@...utronix.de
Subject: [tip:x86/urgent] x86: Check irq_remapped instead of remapping_enabled in destroy_irq()
Commit-ID: 7b79462a20826a7269322113c68ca78d5f67c0bd
Gitweb: http://git.kernel.org/tip/7b79462a20826a7269322113c68ca78d5f67c0bd
Author: Yinghai Lu <yinghai@...nel.org>
AuthorDate: Sat, 30 Oct 2010 01:19:29 -0700
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Sat, 30 Oct 2010 10:28:31 +0200
x86: Check irq_remapped instead of remapping_enabled in destroy_irq()
Russ Anderson reported:
| There is a regression that is causing a NULL pointer dereference
| in free_irte when shutting down xpc. git bisect narrowed it down
| to git commit d585d06(intr_remap: Simplify the code further), which
| changed free_irte(). Reverse applying the patch fixes the problem.
We need to use irq_remapped() for each irq instead of checking only
intr_remapping_enabled as there might be non remapped irqs even when
remapping is enabled.
[ tglx: use cfg instead of retrieving it again. Massaged changelog ]
Reported-bisected-and-tested-by: Russ Anderson <rja@....com>
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
Cc: Suresh Siddha <suresh.b.siddha@...el.com>
LKML-Reference: <4CCBD511.40607@...nel.org>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/x86/kernel/apic/io_apic.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 0929191..7cc0a72 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3109,7 +3109,7 @@ void destroy_irq(unsigned int irq)
irq_set_status_flags(irq, IRQ_NOREQUEST|IRQ_NOPROBE);
- if (intr_remapping_enabled)
+ if (irq_remapped(cfg))
free_irte(irq);
raw_spin_lock_irqsave(&vector_lock, flags);
__clear_irq_vector(irq, cfg);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists