grub2/0173-print-more-debug-info-in-our-module-loader.patch
Peter Jones b8119d9104 Fix a mismerge that makes arm not boot.
Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-16 11:35:26 -04:00

45 lines
1.3 KiB
Diff

From c94146470358e5ba3b2047f8e0aa762f9357a15e Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 1 May 2017 11:19:40 -0400
Subject: [PATCH 173/192] print more debug info in our module loader.
Signed-off-by: Peter Jones <pjones@redhat.com>
---
grub-core/kern/efi/efi.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index 684ca93f8..1f3ac5e1d 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -304,13 +304,23 @@ grub_efi_modules_addr (void)
}
if (i == coff_header->num_sections)
- return 0;
+ {
+ grub_dprintf("sections", "section %d is last section; invalid.\n", i);
+ return 0;
+ }
info = (struct grub_module_info *) ((char *) image->image_base
+ section->virtual_address);
- if (info->magic != GRUB_MODULE_MAGIC)
- return 0;
+ if (section->name[0] != '.' && info->magic != GRUB_MODULE_MAGIC)
+ {
+ grub_dprintf("sections",
+ "section %d has bad magic %08lx, should be %08lx\n",
+ i, info->magic, GRUB_MODULE_MAGIC);
+ return 0;
+ }
+ grub_dprintf("sections", "returning section info for section %d: \"%s\"\n",
+ i, section->name);
return (grub_addr_t) info;
}
--
2.13.4