Commit-ID: bbd391a15d82e14efe9d69ba64cadb855b061dba Gitweb: http://git.kernel.org/tip/bbd391a15d82e14efe9d69ba64cadb855b061dba Author: Prarit Bhargava <prarit@xxxxxxxxxx> AuthorDate: Tue, 27 Apr 2010 11:24:42 -0400 Committer: H. Peter Anvin <hpa@xxxxxxxxx> CommitDate: Fri, 30 Apr 2010 14:31:38 -0700 x86: Fix NULL pointer access in irq_force_complete_move() for Xen guests Upstream PV guests fail to boot because of a NULL pointer in irq_force_complete_move(). It is possible that xen guests have irq_desc->chip_data = NULL. Test for NULL chip_data pointer before attempting to complete an irq move. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> LKML-Reference: <20100427152434.16193.49104.sendpatchset@xxxxxxxxxxxxxxxxxxxxx> Acked-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx> Cc: <stable@xxxxxxxxxx> [2.6.33] --- arch/x86/kernel/apic/io_apic.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 127b871..eb2789c 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -2545,6 +2545,9 @@ void irq_force_complete_move(int irq) struct irq_desc *desc = irq_to_desc(irq); struct irq_cfg *cfg = desc->chip_data; + if (!cfg) + return; + __irq_complete_move(&desc, cfg->vector); } #else -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|