Skip to content

Commit

Permalink
x86: Fix NULL pointer access in irq_force_complete_move() for Xen guests
Browse files Browse the repository at this point in the history
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]
  • Loading branch information
Prarit Bhargava authored and H. Peter Anvin committed Apr 30, 2010
1 parent e67a807 commit bbd391a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/x86/kernel/apic/io_apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bbd391a

Please sign in to comment.