]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
arm/linux: Fix ARM Linux header layout
authorArd Biesheuvel <ard.biesheuvel@arm.com>
Sun, 25 Oct 2020 13:49:34 +0000 (14:49 +0100)
committerDaniel Kiper <daniel.kiper@oracle.com>
Thu, 11 Mar 2021 19:57:42 +0000 (20:57 +0100)
The hdr_offset member of the ARM Linux image header appears at
offset 0x3c, matching the PE/COFF spec's placement of the COFF
header offset in the MS-DOS header. We're currently off by four,
so fix that.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
include/grub/arm/linux.h

index 2e98a6689696ae8b8fadd8e9387613b8f29fb492..bcd5a7eb186eb908525eeaa1965a5eaa84037c94 100644 (file)
@@ -30,7 +30,7 @@ struct linux_arm_kernel_header {
   grub_uint32_t magic;
   grub_uint32_t start; /* _start */
   grub_uint32_t end;   /* _edata */
-  grub_uint32_t reserved2[4];
+  grub_uint32_t reserved2[3];
   grub_uint32_t hdr_offset;
 };