mirror of
https://git.yoctoproject.org/poky
synced 2026-05-04 13:39:49 +02:00
d249d932ad
Backport fixes for : * CVE-2025-0622 - Upstream-Status: Backport from https://git.savannah.gnu.org/cgit/grub.git/commit/?id=2123c5bca7e21fbeb0263df4597ddd7054700726 && https://git.savannah.gnu.org/cgit/grub.git/commit/?id=9c16197734ada8d0838407eebe081117799bfe67 && https://git.savannah.gnu.org/cgit/grub.git/commit/?id=7580addfc8c94cedb0cdfd7a1fd65b539215e637 * CVE-2025-0624 - Upstream-Status: Backport from https://git.savannah.gnu.org/cgit/grub.git/commit/?id=5eef88152833062a3f7e017535372d64ac8ef7e1 * CVE-2025-0677_CVE-2025-0684_CVE-2025-0685_CVE-2025-0686_CVE-2025-0689 - Upstream-Status: Backport from https://git.savannah.gnu.org/cgit/grub.git/commit/?id=47b2dfc7953f70f98ddf35dfdd6e7f4f20283b10 * CVE-2025-0678_CVE-2025-1125 - Upstream-Status: Backport from https://git.savannah.gnu.org/cgit/grub.git/commit/?id=84bc0a9a68835952ae69165c11709811dae7634e * CVE-2025-0690 - Upstream-Status: Backport from https://git.savannah.gnu.org/cgit/grub.git/commit/?id=dad8f502974ed9ad0a70ae6820d17b4b142558fc * CVE-2025-1118 - Upstream-Status: Backport from https://git.savannah.gnu.org/cgit/grub.git/commit/?id=34824806ac6302f91e8cabaa41308eaced25725f (From OE-Core rev: 5c4ee702f93f9bb4fcb557fd067242da16d63da2) Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
45 lines
1.4 KiB
Diff
45 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: Hitendra Prajapati <hprajapati@mvista.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 c4ebe9e..31c53a6 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -581,7 +581,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);
|
|
}
|
|
--
|
|
2.25.1
|
|
|