diff options
| author | Prarit Bhargava <prarit@redhat.com> | 2010-04-27 11:24:42 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-12 15:02:45 -0700 |
| commit | d04fe16c31384a00562f7f9ca0cf78641a510ceb (patch) | |
| tree | 04a2c98698fba91f3ee80e87db4d144302087f70 /arch | |
| parent | 0d9687a4d2a9f27ab52c2914b432fae5cb4a70b1 (diff) | |
x86: Fix NULL pointer access in irq_force_complete_move() for Xen guests
commit bbd391a15d82e14efe9d69ba64cadb855b061dba upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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 be370593aee8..b35c160a4c3b 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -2539,6 +2539,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 |