diff options
| author | Prarit Bhargava <[email protected]> | 2010-04-27 11:24:42 -0400 |
|---|---|---|
| committer | H. Peter Anvin <[email protected]> | 2010-04-30 14:31:38 -0700 |
| commit | bbd391a15d82e14efe9d69ba64cadb855b061dba (patch) | |
| tree | fa390e76f76519efd389538f9a12027aaefd7f4d | |
| parent | e67a807f3d9a82fa91817871f1c0e2e04da993b8 (diff) | |
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 <[email protected]>
LKML-Reference: <[email protected]>
Acked-by: Suresh Siddha <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
Cc: <[email protected]> [2.6.33]
| -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 127b8718abfb..eb2789c3f721 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 |