2018-03-15 19:05:59 +00:00
|
|
|
From 6025b0afe64157eb922d562e85f1734b7ce800c9 Mon Sep 17 00:00:00 2001
|
2017-06-16 19:31:32 +00:00
|
|
|
From: Peter Jones <pjones@redhat.com>
|
|
|
|
Date: Mon, 1 May 2017 11:19:40 -0400
|
2018-03-16 19:23:37 +00:00
|
|
|
Subject: [PATCH 172/216] print more debug info in our module loader.
|
2017-06-16 19:31:32 +00:00
|
|
|
|
|
|
|
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
|
2018-03-15 19:05:59 +00:00
|
|
|
index 684ca93f8f4..866fc20e162 100644
|
2017-06-16 19:31:32 +00:00
|
|
|
--- a/grub-core/kern/efi/efi.c
|
|
|
|
+++ b/grub-core/kern/efi/efi.c
|
2018-01-17 22:04:09 +00:00
|
|
|
@@ -304,13 +304,23 @@ grub_efi_modules_addr (void)
|
2017-06-16 19:31:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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",
|
2018-03-15 19:05:59 +00:00
|
|
|
+ "section %d has bad magic %08x, should be %08x\n",
|
2017-06-16 19:31:32 +00:00
|
|
|
+ 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;
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2018-02-27 18:56:41 +00:00
|
|
|
2.15.0
|
2017-06-16 19:31:32 +00:00
|
|
|
|