x86 efi: bugfix interrupt disabling sequence
PATCH 1/1 x86 efi: bugfix interrupt disabling sequence
The problem in efi_main was that the idt was cleared before the interrupts were disabled.
The UEFI spec states that interrupts aren't used so this shouldn't be too much of a problem. Peripherals however don't necessarily know about this and thus might cause interrupts to happen anyway. Even if ExitBootServices() has been called.
This means there is a risk of an interrupt being triggered while the IDT register is nullified and the interrupt bit hasn't been cleared, allowing for a triple fault.
This patch disables the interrupt flag, while leaving the existing IDT in place. The CPU won't care about the IDT at all as long as the interrupt bit is off, so it's safe to leave it in place as nothing will ever happen to it.
--- arch/x86/boot/compressed/eboot.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
arch/x86/boot/compressed/eboot.c +1 -14
@@ -1188,17 +1188,6 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table, goto fail; } - status =efi_call_phys3 (sys_table->boottime->allocate_pool, -EFI_LOADER_DATA ,sizeof (*idt), - (void **)&idt); -if (status !=EFI_SUCCESS ) { -efi_printk ("Failed to alloc mem for idt structure\n" ); - goto fail; - } - - idt->size =0 ; - idt->address =0 ; -/* * If the kernel isn't already loaded at the preferred load * address, relocate it.
@@ -1267,10 +1256,8 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table, desc->base2 =0x00 ;#endif /* CONFIG_X86_64 */ - asmvolatile ("lidt %0" : :"m" (*idt)); - asmvolatile ("lgdt %0" : :"m" (*gdt)); - asmvolatile ("cli" ); + asmvolatile ("lgdt %0" : :"m" (*gdt));return boot_params; fail:
Signature · 1 line
1.8.4
Matt Fleming
AppliedQuoted 17 lines · Bart Kuivenhoven
The problem in
efi_mainwas that the idt was cleared before the interrupts were disabled.The UEFI spec states that interrupts aren't used so this shouldn't be too much of a problem. Peripherals however don't necessarily know about this and thus might cause interrupts to happen anyway. Even if
ExitBootServices()has been called.This means there is a risk of an interrupt being triggered while the IDT register is nullified and the interrupt bit hasn't been cleared, allowing for a triple fault.
This patch disables the interrupt flag, while leaving the existing IDT in place. The CPU won't care about the IDT at all as long as the interrupt bit is off, so it's safe to leave it in place as nothing will ever happen to it.
Quoted 4 lines
Signed-off-by Bart Kuivenhoven <[email protected]>--- arch/x86/boot/compressed/eboot.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
Applied, thanks Bart!
Signature · 1 line
Matt Fleming, Intel Open Source Technology Center