[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/8] linux/arm: account for COFF headers appearing at unexpect
From: |
Ard Biesheuvel |
Subject: |
[PATCH v3 5/8] linux/arm: account for COFF headers appearing at unexpected offsets |
Date: |
Thu, 18 Aug 2022 16:51:32 +0200 |
The way we load the Linux and PE/COFF image headers depends on a fixed
placement of the COFF header at offset 0x40 into the file. This is a
reasonable default, given that this is where Linux emits it today.
However, in order to comply with the PE/COFF spec, which allows this
header to appear anywhere in the file, let's ensure that we read the
header from where it actually appears in the file if it is not located
at offset 0x40.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
grub-core/loader/arm64/linux.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
index 7c0f17cf933d..56ba8d0a6ea3 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -63,6 +63,21 @@ grub_arch_efi_linux_load_image_header (grub_file_t file,
grub_dprintf ("linux", "UEFI stub kernel:\n");
grub_dprintf ("linux", "PE/COFF header @ %08x\n", lh->hdr_offset);
+ /*
+ * The PE/COFF spec permits the COFF header to appear anywhere in the file,
so
+ * we need to double check whether it was where we expected it, and if not,
we
+ * must load it from the correct offset into the coff_image_header field of
+ * struct linux_arch_kernel_header.
+ */
+ if ((grub_uint8_t *) lh + lh->hdr_offset != (grub_uint8_t *)
&lh->coff_image_header)
+ {
+ grub_file_seek (file, lh->hdr_offset);
+
+ if (grub_file_read (file, &lh->coff_image_header, sizeof(struct
grub_coff_image_header))
+ != sizeof(struct grub_coff_image_header))
+ return grub_error(GRUB_ERR_FILE_READ_ERROR, "failed to read COFF image
header");
+ }
+
return GRUB_ERR_NONE;
}
--
2.35.1
- [PATCH v3 0/8] linux: implement LoadFile2 initrd loading, Ard Biesheuvel, 2022/08/18
- [PATCH v3 1/8] loader: drop argv[] argument in grub_initrd_load(), Ard Biesheuvel, 2022/08/18
- [PATCH v3 2/8] efi: move MS-DOS stub out of generic PE header definition, Ard Biesheuvel, 2022/08/18
- [PATCH v3 3/8] arm64/linux: Remove magic number header field check, Ard Biesheuvel, 2022/08/18
- [PATCH v3 6/8] efi/efinet: Don't close connections at fini_hw() time, Ard Biesheuvel, 2022/08/18
- [PATCH v3 4/8] linux/arm: unify ARM/arm64 vs Xen PE/COFF header handling, Ard Biesheuvel, 2022/08/18
- [PATCH v3 5/8] linux/arm: account for COFF headers appearing at unexpected offsets,
Ard Biesheuvel <=
- [PATCH v3 7/8] efi: implement LoadFile2 initrd loading protocol for Linux, Ard Biesheuvel, 2022/08/18
- [PATCH v3 8/8] linux: ignore FDT unless we need to modify it, Ard Biesheuvel, 2022/08/18