Skip to content

Commit

Permalink
x86 efi: bugfix interrupt disabling sequence
Browse files Browse the repository at this point in the history
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.

[ Removed the now unused 'idt' variable - Matt ]

Signed-off-by: Bart Kuivenhoven <bemk@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
  • Loading branch information
Bart Kuivenhoven authored and Matt Fleming committed Sep 30, 2013
1 parent d2078d5 commit 0ce6cda
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions arch/x86/boot/compressed/eboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
struct boot_params *efi_main(void *handle, efi_system_table_t *_table,
struct boot_params *boot_params)
{
struct desc_ptr *gdt, *idt;
struct desc_ptr *gdt;
efi_loaded_image_t *image;
struct setup_header *hdr = &boot_params->hdr;
efi_status_t status;
Expand Down Expand Up @@ -780,17 +780,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(sys_table, "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.
Expand Down Expand Up @@ -865,10 +854,8 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table,
desc->base2 = 0x00;
#endif /* CONFIG_X86_64 */

asm volatile ("lidt %0" : : "m" (*idt));
asm volatile ("lgdt %0" : : "m" (*gdt));

asm volatile("cli");
asm volatile ("lgdt %0" : : "m" (*gdt));

return boot_params;
fail:
Expand Down

0 comments on commit 0ce6cda

Please sign in to comment.