3ffe88cd96
Resolves: #RHEL-141594 Resolves: #CVE-2025-54771 #CVE-2025-61661 Resolves: #CVE-2025-61662 #CVE-2025-61663 #CVE-2025-61664 Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 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] 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
|
|
|
|
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>
|
|
---
|
|
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 0e51b5d28ad0..92e91b35e87f 100644
|
|
--- a/grub-core/gettext/gettext.c
|
|
+++ b/grub-core/gettext/gettext.c
|
|
@@ -509,6 +509,8 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
|
|
return 0;
|
|
}
|
|
|
|
+static grub_command_t cmd;
|
|
+
|
|
GRUB_MOD_INIT (gettext)
|
|
{
|
|
const char *lang;
|
|
@@ -528,13 +530,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);
|
|
@@ -551,6 +554,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);
|
|
|