aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrarit Bhargava <prarit@redhat.com>2010-04-27 11:24:42 -0400
committerH. Peter Anvin <hpa@zytor.com>2010-04-30 14:31:38 -0700
commitbbd391a15d82e14efe9d69ba64cadb855b061dba (patch)
treefa390e76f76519efd389538f9a12027aaefd7f4d
parente67a807f3d9a82fa91817871f1c0e2e04da993b8 (diff)
downloadmrst-s0i3-test-bbd391a15d82e14efe9d69ba64cadb855b061dba.tar.gz
mrst-s0i3-test-bbd391a15d82e14efe9d69ba64cadb855b061dba.tar.xz
mrst-s0i3-test-bbd391a15d82e14efe9d69ba64cadb855b061dba.zip
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@redhat.com> LKML-Reference: <20100427152434.16193.49104.sendpatchset@prarit.bos.redhat.com> Acked-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: <stable@kernel.org> [2.6.33]
-rw-r--r--arch/x86/kernel/apic/io_apic.c3
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 127b8718abf..eb2789c3f72 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