Check FileHeader.Machine to make sure the EFI executable image is built for the same architecture. After this change, 32-bit U-Boot on x86 will print an error message instead of loading an x86_64 image and crashing.
Signed-off-by: Ivan Gorinov <[email protected]> --- include/pe.h | 1 + lib/efi_loader/efi_image_loader.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/pe.h b/include/pe.h index c3a19ce..2435069 100644 --- a/include/pe.h +++ b/include/pe.h @@ -38,6 +38,7 @@ typedef struct _IMAGE_DOS_HEADER { #define IMAGE_DOS_SIGNATURE 0x5A4D /* MZ */ #define IMAGE_NT_SIGNATURE 0x00004550 /* PE00 */ +#define IMAGE_FILE_MACHINE_INTEL386 0x014c #define IMAGE_FILE_MACHINE_ARM 0x01c0 #define IMAGE_FILE_MACHINE_THUMB 0x01c2 #define IMAGE_FILE_MACHINE_ARMNT 0x01c4 diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 74c6a9f..9b4db62 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -126,15 +126,23 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) void *entry; uint64_t image_size; unsigned long virt_size = 0; + int machine_type = 0; bool can_run_nt64 = true; bool can_run_nt32 = true; #if defined(CONFIG_ARM64) + machine_type = IMAGE_FILE_MACHINE_ARM64; can_run_nt32 = false; #elif defined(CONFIG_ARM) can_run_nt64 = false; #endif +#if defined(CONFIG_X86_64) + machine_type = IMAGE_FILE_MACHINE_AMD64; +#elif defined(CONFIG_X86) + machine_type = IMAGE_FILE_MACHINE_INTEL386; +#endif + dos = efi; if (dos->e_magic != IMAGE_DOS_SIGNATURE) { printf("%s: Invalid DOS Signature\n", __func__); @@ -147,6 +155,11 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) return NULL; } + if (machine_type && nt->FileHeader.Machine != machine_type) { + printf("%s: Incorrect machine type\n", __func__); + return NULL; + } + /* Calculate upper virtual address boundary */ num_sections = nt->FileHeader.NumberOfSections; sections = (void *)&nt->OptionalHeader + -- 2.7.4 _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
