From 846cbabeeedada81c3d02e39f2de66f4e7d1b7d7 Mon Sep 17 00:00:00 2001 From: Wentao Guan Date: Sun, 25 Aug 2024 18:41:47 +0800 Subject: [PATCH] loader/linux: Remove magic number header field check The "ARM\x64" magic number in the file header identifies an image as one that implements the bare metal boot protocol, allowing the loader to simply move the file to a suitably aligned address in memory, with sufficient headroom for the trailing .bss segment (the required memory size is described in the header as well). Note of this matters for GRUB, as it only supports EFI boot. EFI does not care about this magic number, and nor should GRUB: this prevents us from booting other PE linux images, such as the generic EFI zboot decompressor, which is a pure PE/COFF image, and does not implement the bare metal boot protocol. So drop the magic number check. Signed-off-by: Ard Biesheuvel Reviewed-by: Daniel Kiper Signed-off-by: Wentao Guan --- GRUB2/MOD_SRC/grub-2.04/grub-core/loader/efi/linux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/efi/linux.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/efi/linux.c index fad2478d..b8eb68d2 100644 --- a/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/efi/linux.c +++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/efi/linux.c @@ -64,8 +64,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), grub_err_t grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh) { - if (lh->magic != GRUB_LINUX_ARMXX_MAGIC_SIGNATURE) - return grub_error(GRUB_ERR_BAD_OS, "invalid magic number"); if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC) return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,