From: B Horn <b@horn.uk>
Date: Thu, 18 Apr 2024 19:29:39 +0000 (+0100)
Subject: commands/minicmd: Block the dump command in lockdown mode
X-Git-Tag: archive/raspbian/2.12-9+rpi1^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5a6db63d68d95d47954eeec01ec0ad87d8c7f202;p=grub2.git

commands/minicmd: Block the dump command in lockdown mode

The dump enables a user to read memory which should not be possible
in lockdown mode.

Fixes: CVE-2025-1118

Reported-by: B Horn <b@horn.uk>
Reported-by: Jonathan Bar Or <jonathanbaror@gmail.com>
Signed-off-by: B Horn <b@horn.uk>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Gbp-Pq: Topic cve-2025-jan
Gbp-Pq: Name commands-minicmd-Block-the-dump-command-in-lockdown-mode.patch
---

diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
index 2862908..8c5ee3e 100644
--- a/grub-core/commands/minicmd.c
+++ b/grub-core/commands/minicmd.c
@@ -203,8 +203,8 @@ GRUB_MOD_INIT(minicmd)
     grub_register_command ("help", grub_mini_cmd_help,
 			   0, N_("Show this message."));
   cmd_dump =
-    grub_register_command ("dump", grub_mini_cmd_dump,
-			   N_("ADDR [SIZE]"), N_("Show memory contents."));
+    grub_register_command_lockdown ("dump", grub_mini_cmd_dump,
+				    N_("ADDR [SIZE]"), N_("Show memory contents."));
   cmd_rmmod =
     grub_register_command ("rmmod", grub_mini_cmd_rmmod,
 			   N_("MODULE"), N_("Remove a module."));