xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: io-apic - interrupt remapping fix

Browse Source 
Interrupt remapping could lead to NULL dereference in case of
kzalloc failed and memory leak in other way. So fix the
both cases.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov
2008-09-18 23:37:57 +04:00
committed by Ingo Molnar
parent 2976fe2012
commit 5ffa4eb222
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/kernel/apic.c
View File

@@ -1360,7 +1360,12 @@ void enable_IR_x2apic(void)
local_irq_save(flags);
mask_8259A();
save_mask_IO_APIC_setup();
ret = save_mask_IO_APIC_setup();
if (ret) {
printk(KERN_INFO "Saving IO-APIC state failed: %d\n", ret);
goto end;
}
ret = enable_intr_remapping(1);
@@ -1370,14 +1375,15 @@ void enable_IR_x2apic(void)
}
if (ret)
goto end;
goto end_restore;
if (!x2apic) {
x2apic = 1;
apic_ops = &x2apic_ops;
enable_x2apic();
}
end:
end_restore:
if (ret)
/*
* IR enabling failed
@@ -1386,6 +1392,7 @@ end:
else
reinit_intr_remapped_IO_APIC(x2apic_preenabled);
end:
unmask_8259A();
local_irq_restore(flags);