16accb6b24
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 9c16197734ada8d0838407eebe081117799bfe67 Mon Sep 17 00:00:00 2001
|
|
From: B Horn <b@horn.uk>
|
|
Date: Fri, 1 Nov 2024 23:46:55 +0000
|
|
Subject: [PATCH 2/3] normal: Remove variables hooks on module unload
|
|
|
|
The normal module does not entirely cleanup after itself in
|
|
its GRUB_MOD_FINI() leaving a few variables hooks in place.
|
|
It is not possible to unload normal module now but fix the
|
|
issues for completeness.
|
|
|
|
On the occasion replace 0s with NULLs for "pager" variable
|
|
hooks unregister.
|
|
|
|
Fixes: CVE-2025-0622
|
|
|
|
Reported-by: B Horn <b@horn.uk>
|
|
Signed-off-by: B Horn <b@horn.uk>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
|
CVE: CVE-2025-0622
|
|
Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=9c16197734ada8d0838407eebe081117799bfe67]
|
|
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
|
---
|
|
grub-core/normal/main.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index 838f57fa5..04d058f55 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -582,7 +582,9 @@ GRUB_MOD_FINI(normal)
|
|
grub_xputs = grub_xputs_saved;
|
|
|
|
grub_set_history (0);
|
|
- grub_register_variable_hook ("pager", 0, 0);
|
|
+ grub_register_variable_hook ("pager", NULL, NULL);
|
|
+ grub_register_variable_hook ("color_normal", NULL, NULL);
|
|
+ grub_register_variable_hook ("color_highlight", NULL, NULL);
|
|
grub_fs_autoload_hook = 0;
|
|
grub_unregister_command (cmd_clear);
|
|
}
|