a3bfe35d12
- Fix grub.cfg boot counting snippet generation (lorbus) Resolves: rhbz#1614637 - Fix spurrious allocation error reporting on EFI boot Resolves: rhbz#1635319 - Stop doing TPM on BIOS *again*. It just doesn't work. Related: rhbz#1579835 - Make blscfg module loadable on older grub2 i386-pc and powerpc-ieee1275 builds - Fix execstack cropping up in grub2-tools - Ban stack trampolines with compiler flags. Signed-off-by: Peter Jones <pjones@redhat.com>
25 lines
909 B
Diff
25 lines
909 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 2 Oct 2018 13:26:42 -0400
|
|
Subject: [PATCH] fixup! arm/arm64 loader: Better memory allocation and error
|
|
messages.
|
|
|
|
---
|
|
grub-core/kern/efi/mm.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
|
|
index a553f817edb..cac775fc935 100644
|
|
--- a/grub-core/kern/efi/mm.c
|
|
+++ b/grub-core/kern/efi/mm.c
|
|
@@ -169,6 +169,9 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
|
|
status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &ret);
|
|
if (status != GRUB_EFI_SUCCESS)
|
|
{
|
|
+ grub_dprintf ("efi",
|
|
+ "allocate_pages(%d, %d, 0x%0lx, 0x%016lx) = 0x%016lx\n",
|
|
+ alloctype, memtype, pages, address, status);
|
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
|
|
return NULL;
|
|
}
|