mm: do not update mem attrs even if EFI protocol is present

A temporal workaround while a real fix is being elaborated.

Resolves: #RHEL-97086

Signed-off-by: Gerd Hoffman <ghoffman@redhat.com>
Signed-off-by: Leo Sandoval <lsandova@redhat.com>
This commit is contained in:
Leo Sandoval 2025-07-15 14:43:19 -06:00
parent 079a0bd238
commit 78ed8c744d
3 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,28 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Leo Sandoval <lsandova@redhat.com>
Date: Tue, 15 Jul 2025 14:24:05 -0600
Subject: [PATCH] mm.c: do not update mem attrs even if EFI protocol is present
A temporal workaround while a real fix is being elaborated.
Resolves: #RHEL-97086
Signed-off-by: Gerd Hoffman <ghoffman@redhat.com>
Signed-off-by: Leo Sandoval <lsandova@redhat.com>
---
grub-core/kern/efi/mm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
index 464fe1c3c0..80af7b4dfc 100644
--- a/grub-core/kern/efi/mm.c
+++ b/grub-core/kern/efi/mm.c
@@ -892,7 +892,7 @@ grub_update_mem_attrs (grub_addr_t addr, grub_size_t size,
grub_err_t err;
proto = grub_efi_locate_protocol (&protocol_guid, 0);
- if (!proto)
+ if (1 /* !proto */)
return GRUB_ERR_NONE;
err = grub_get_mem_attrs (addr, size, &before);

View File

@ -365,4 +365,5 @@ Patch0365: 0365-loader-efi-Fix-RISC-V-build.patch
Patch0366: 0366-kern-riscv-efi-init-Use-time-register-in-grub_efi_ge.patch
Patch0367: 0367-Use-medany-instead-of-large-model-for-RISCV.patch
Patch0368: 0368-10_linux.in-escape-kernel-option-characters-properly.patch
Patch0369: 0369-blscfg-check-if-variable-is-escaped-before-consideri.patch
Patch0369: 0369-blscfg-check-if-variable-is-escaped-before-consideri.patch
Patch0370: 0370-mm.c-do-not-update-mem-attrs-even-if-EFI-protocol-is.patch

View File

@ -17,7 +17,7 @@
Name: grub2
Epoch: 1
Version: 2.12
Release: 21%{?dist}
Release: 22%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
License: GPL-3.0-or-later
URL: http://www.gnu.org/software/grub/
@ -583,6 +583,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif
%changelog
* Tue Jul 15 2025 Leo Sandoval <lsandova@redhat.com> 2.12-22
- workaround: do not update mem attrs even if EFI protocol is present
- Resolves: #RHEL-97086
* Fri Jun 6 2025 Leo Sandoval <lsandova@redhat.com> 2.12-21
- Bump version (see CS-2896)
- Resolves: #RHEL-94342