[PATCH -tip/master] x86: io-apic - restore_IO_APIC_setup NULLpointer quick fix

[Cyrill Gorcunov]

Check if memory was granted first - we don't like NULL deref.
It's a *quick* fix. Actually it's better to hadle this error
at moment of memory allocation. It's save_mask_IO_APIC_setup
route who allocates this memory (just for the record).

Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
---

I'll handle this in _normal_ way tomorrow. Please review.

Index: linux-2.6.git/arch/x86/kernel/io_apic.c
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/io_apic.c	2008-09-18 19:17:16.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/io_apic.c	2008-09-18 23:34:40.000000000 +0400
@@ -852,10 +852,14 @@ void restore_IO_APIC_setup(void)
 {
 	int apic, pin;
 
-	for (apic = 0; apic < nr_ioapics; apic++)
+	for (apic = 0; apic < nr_ioapics; apic++) {
+		/* FIXME: it should be handled at allocation time --cvg */
+		if (!early_ioapic_entries[apic])
+			break;
 		for (pin = 0; pin < nr_ioapic_registers[apic]; pin++)
 			ioapic_write_entry(apic, pin,
 					   early_ioapic_entries[apic][pin]);
+	}
 }
 
 void reinit_intr_remapped_IO_APIC(int intr_remapping)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/