74f9c62794
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com> (cherry picked from commit c141a13130da5dca205b607533751a6ba6c9581e)
36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From 0bf56bce47489c059e50e61a3db7f682d8c44b56 Mon Sep 17 00:00:00 2001
|
|
From: B Horn <b@horn.uk>
|
|
Date: Sun, 12 May 2024 11:08:23 +0100
|
|
Subject: [PATCH 37/73] 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 6a1c7f5d3..f660946a2 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;
|
|
+
|
|
ctx.dirname = grub_strndup (dirname, p - dirname);
|
|
if (ctx.dirname == NULL)
|
|
goto fail;
|
|
--
|
|
2.33.0
|
|
|