mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 06:22:43 +00:00
7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 1 May 2017 11:19:40 -0400
|
|
Subject: [PATCH] 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 e339f264b3a..562d6887e0e 100644
|
|
--- a/grub-core/kern/efi/efi.c
|
|
+++ b/grub-core/kern/efi/efi.c
|
|
@@ -313,13 +313,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 %08x, should be %08x\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;
|
|
}
|
|
|