Commit 396f1a08 authored by Matt Fleming's avatar Matt Fleming

x86/efi: Fix boot failure with EFI stub

commit 54b52d87 ("x86/efi: Build our own EFI services pointer
table") introduced a regression because the 64-bit file_size()
implementation passed a pointer to a 32-bit data object, instead of a
pointer to a 64-bit object.

Because the firmware treats the object as 64-bits regardless it was
reading random values from the stack for the upper 32-bits.

This resulted in people being unable to boot their machines, after
seeing the following error messages,

    Failed to get file info size
    Failed to alloc highmem for files
Reported-by: default avatarDzmitry Sledneu <dzmitry.sledneu@gmail.com>
Reported-by: default avatarKoen Kooi <koen@dominion.thruhere.net>
Tested-by: default avatarKoen Kooi <koen@dominion.thruhere.net>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 204b0a1a
...@@ -112,7 +112,7 @@ __file_size64(void *__fh, efi_char16_t *filename_16, ...@@ -112,7 +112,7 @@ __file_size64(void *__fh, efi_char16_t *filename_16,
efi_file_info_t *info; efi_file_info_t *info;
efi_status_t status; efi_status_t status;
efi_guid_t info_guid = EFI_FILE_INFO_ID; efi_guid_t info_guid = EFI_FILE_INFO_ID;
u32 info_sz; u64 info_sz;
status = efi_early->call((unsigned long)fh->open, fh, &h, filename_16, status = efi_early->call((unsigned long)fh->open, fh, &h, filename_16,
EFI_FILE_MODE_READ, (u64)0); EFI_FILE_MODE_READ, (u64)0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment