From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Mon, 11 Jan 2021 16:57:37 +1100 Subject: [PATCH] commands/ls: Require device_name is not NULL before printing This can be triggered with: ls -l (0 0*) and causes a NULL deref in grub_normal_print_device_info(). I'm not sure if there's any implication with the IEEE 1275 platform. Signed-off-by: Daniel Axtens Reviewed-by: Daniel Kiper --- grub-core/commands/ls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c index c25161cc4f2..ed646201035 100644 --- a/grub-core/commands/ls.c +++ b/grub-core/commands/ls.c @@ -196,7 +196,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human) goto fail; } - if (! *path) + if (! *path && device_name) { if (grub_errno == GRUB_ERR_UNKNOWN_FS) grub_errno = GRUB_ERR_NONE;