33 lines
996 B
Diff
33 lines
996 B
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: B Horn <b@horn.uk>
|
||
|
|
Date: Sun, 12 May 2024 11:08:23 +0100
|
||
|
|
Subject: [PATCH] commands/ls: Fix NULL dereference
|
||
|
|
|
||
|
|
The grub_strrchr() may return NULL when the dirname do not contain "/".
|
||
|
|
This can happen on broken filesystems.
|
||
|
|
|
||
|
|
Reported-by: B Horn <b@horn.uk>
|
||
|
|
Signed-off-by: B Horn <b@horn.uk>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
---
|
||
|
|
grub-core/commands/ls.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
|
||
|
|
index 8e98c73cc..783c82713 100644
|
||
|
|
--- a/grub-core/commands/ls.c
|
||
|
|
+++ b/grub-core/commands/ls.c
|
||
|
|
@@ -241,7 +241,11 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
|
||
|
|
|
||
|
|
grub_file_close (file);
|
||
|
|
|
||
|
|
- p = grub_strrchr (dirname, '/') + 1;
|
||
|
|
+ p = grub_strrchr (dirname, '/');
|
||
|
|
+ if (p == NULL)
|
||
|
|
+ goto fail;
|
||
|
|
+ ++p;
|
||
|
|
+
|
||
|
|
dirname = grub_strndup (dirname, p - dirname);
|
||
|
|
if (! dirname)
|
||
|
|
goto fail;
|