tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gettext/gettext: Unregister gettext command on module unload

Browse Source 
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>
This commit is contained in:
Alec Brown 2025-08-21 21:14:06 +00:00 committed by Daniel Kiper
parent 10e58a14db
commit 8ed78fd9f0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
grub-core/gettext/gettext.c
View File

@ -502,6 +502,8 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
return 0; return 0;
} }
static grub_command_t cmd;
GRUB_MOD_INIT (gettext) GRUB_MOD_INIT (gettext)
{ {
const char *lang; const char *lang;
@ -521,13 +523,14 @@ GRUB_MOD_INIT (gettext)
grub_register_variable_hook ("locale_dir", NULL, read_main); grub_register_variable_hook ("locale_dir", NULL, read_main);
grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary); grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
grub_register_command_p1 ("gettext", grub_cmd_translate, cmd = grub_register_command_p1 ("gettext", grub_cmd_translate,
N_("STRING"), N_("STRING"),
/* TRANSLATORS: It refers to passing the string through gettext. /*
So it's "translate" in the same meaning as in what you're * TRANSLATORS: It refers to passing the string through gettext.
doing now. * So it's "translate" in the same meaning as in what you're
*/ * doing now.
N_("Translates the string with the current settings.")); */
N_("Translates the string with the current settings."));
/* Reload .mo file information if lang changes. */ /* Reload .mo file information if lang changes. */
grub_register_variable_hook ("lang", NULL, grub_gettext_env_write_lang); 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 ("secondary_locale_dir", NULL, NULL);
grub_register_variable_hook ("lang", NULL, NULL); grub_register_variable_hook ("lang", NULL, NULL);
grub_unregister_command (cmd);
grub_gettext_delete_list (&main_context); grub_gettext_delete_list (&main_context);
grub_gettext_delete_list (&secondary_context); grub_gettext_delete_list (&secondary_context);