From: Alec Brown <[email protected]> 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 <[email protected]> Signed-off-by: Alec Brown <[email protected]> Reviewed-by: Daniel Kiper <[email protected]> --- 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.11.0 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
