mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
17a65b334d
References: https://nvd.nist.gov/vuln/detail/CVE-2025-54770 https://nvd.nist.gov/vuln/detail/CVE-2025-61661 https://nvd.nist.gov/vuln/detail/CVE-2025-61662 https://nvd.nist.gov/vuln/detail/CVE-2025-61663 https://nvd.nist.gov/vuln/detail/CVE-2025-61664 (From OE-Core rev: c28fa3e6421257f50d4ae283cca28fadb621f831) Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
From 498dc73aa661bb1cae4b06572b5cef154dcb1fb7 Mon Sep 17 00:00:00 2001
|
|
From: Alec Brown <alec.r.brown@oracle.com>
|
|
Date: Thu, 21 Aug 2025 21:14:06 +0000
|
|
Subject: [PATCH 3/4] gettext/gettext: Unregister gettext command on module
|
|
unload
|
|
|
|
When the gettext module is loaded, the gettext command is registered but
|
|
isn't unregistered when the module is unloaded. We need to add a call to
|
|
grub_unregister_command() when unloading the module.
|
|
|
|
Fixes: CVE-2025-61662
|
|
|
|
CVE: CVE-2025-61662
|
|
|
|
Upstream-Status: Backport
|
|
[https://gitweb.git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=8ed78fd9f0852ab218cc1f991c38e5a229e43807]
|
|
|
|
Reported-by: Alec Brown <alec.r.brown@oracle.com>
|
|
Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
|
|
---
|
|
grub-core/gettext/gettext.c | 19 ++++++++++++-------
|
|
1 file changed, 12 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
|
|
index 9ffc73428..edebed998 100644
|
|
--- a/grub-core/gettext/gettext.c
|
|
+++ b/grub-core/gettext/gettext.c
|
|
@@ -502,6 +502,8 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
|
|
return 0;
|
|
}
|
|
|
|
+static grub_command_t cmd;
|
|
+
|
|
GRUB_MOD_INIT (gettext)
|
|
{
|
|
const char *lang;
|
|
@@ -521,13 +523,14 @@ GRUB_MOD_INIT (gettext)
|
|
grub_register_variable_hook ("locale_dir", NULL, read_main);
|
|
grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
|
|
|
|
- grub_register_command_p1 ("gettext", grub_cmd_translate,
|
|
- N_("STRING"),
|
|
- /* TRANSLATORS: It refers to passing the string through gettext.
|
|
- So it's "translate" in the same meaning as in what you're
|
|
- doing now.
|
|
- */
|
|
- N_("Translates the string with the current settings."));
|
|
+ cmd = grub_register_command_p1 ("gettext", grub_cmd_translate,
|
|
+ N_("STRING"),
|
|
+ /*
|
|
+ * TRANSLATORS: It refers to passing the string through gettext.
|
|
+ * So it's "translate" in the same meaning as in what you're
|
|
+ * doing now.
|
|
+ */
|
|
+ N_("Translates the string with the current settings."));
|
|
|
|
/* Reload .mo file information if lang changes. */
|
|
grub_register_variable_hook ("lang", NULL, grub_gettext_env_write_lang);
|
|
@@ -544,6 +547,8 @@ GRUB_MOD_FINI (gettext)
|
|
grub_register_variable_hook ("secondary_locale_dir", NULL, NULL);
|
|
grub_register_variable_hook ("lang", NULL, NULL);
|
|
|
|
+ grub_unregister_command (cmd);
|
|
+
|
|
grub_gettext_delete_list (&main_context);
|
|
grub_gettext_delete_list (&secondary_context);
|
|
|
|
--
|
|
2.34.1
|
|
|