x86/ioapic: Fix fixmap error path logic in ioapic_init_mappings()
PATCH 1/1 x86/ioapic: Fix fixmap error path logic in ioapic_init_mappings()
In the case that bad_ioapic_register() fails, the current position of idx++ means that clear_fixmap(idx) will be called with the wrong index, and not clean up the mapping just created.
Increment idx as part of the loop, rather than midway through the loop body.
Signed-off-by Andrew Cooper <[email protected]>
---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
--- xen/arch/x86/io_apic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
xen/arch/x86/io_apic.c +1 -2
@@ -2543,7 +2543,7 @@ static void __init ioapic_init_mappings(void) nr_irqs_gsi =0 ; -for ( i =0 ; i < nr_ioapics; i++ ) +for ( i =0 ; i < nr_ioapics; i++, idx++ ) {union IO_APIC_reg_01 reg_01;paddr_t ioapic_phys = mp_ioapics[i].mpc_apicaddr;
@@ -2560,7 +2560,6 @@ static void __init ioapic_init_mappings(void)set_fixmap_nocache (idx, ioapic_phys);apic_printk (APIC_VERBOSE ,"mapped IOAPIC to %08Lx (%08lx)\n" ,__fix_to_virt (idx), ioapic_phys); - idx++;if (bad_ioapic_register (i) ) {
Signature · 1 line
2.11.0
Quoted 7 lines · Andrew Cooper
In the case that
bad_ioapic_register()fails, the current position of idx++ means thatclear_fixmap(idx)will be called with the wrong index, and not clean up the mapping just created.Increment idx as part of the loop, rather than midway through the loop body.
Signed-off-by Andrew Cooper <[email protected]>
Reviewed-by Jan Beulich <[email protected]>