Messages in this thread Patch in this message | | | Date | Thu, 18 Sep 2008 23:37:57 +0400 | From | Cyrill Gorcunov <> | Subject | [PATCH -tip/master] x86: io-apic - restore_IO_APIC_setup NULL pointer quick fix |
| |
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@gmail.com> ---
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)
| |