1*4882a593SmuzhiyunFrom 6afbe6063c95b827372f9ec310c9fc7461311eb1 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Daniel Axtens <dja@axtens.net>
3*4882a593SmuzhiyunDate: Mon, 11 Jan 2021 16:57:37 +1100
4*4882a593SmuzhiyunSubject: [PATCH] commands/ls: Require device_name is not NULL before printing
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunThis can be triggered with:
7*4882a593Smuzhiyun  ls -l (0 0*)
8*4882a593Smuzhiyunand causes a NULL deref in grub_normal_print_device_info().
9*4882a593Smuzhiyun
10*4882a593SmuzhiyunI'm not sure if there's any implication with the IEEE 1275 platform.
11*4882a593Smuzhiyun
12*4882a593SmuzhiyunSigned-off-by: Daniel Axtens <dja@axtens.net>
13*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
14*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
15*4882a593Smuzhiyun---
16*4882a593Smuzhiyun grub-core/commands/ls.c | 2 +-
17*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-)
18*4882a593Smuzhiyun
19*4882a593Smuzhiyundiff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
20*4882a593Smuzhiyunindex 5b7491a..326d2d6 100644
21*4882a593Smuzhiyun--- a/grub-core/commands/ls.c
22*4882a593Smuzhiyun+++ b/grub-core/commands/ls.c
23*4882a593Smuzhiyun@@ -196,7 +196,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
24*4882a593Smuzhiyun       goto fail;
25*4882a593Smuzhiyun     }
26*4882a593Smuzhiyun
27*4882a593Smuzhiyun-  if (! *path)
28*4882a593Smuzhiyun+  if (! *path && device_name)
29*4882a593Smuzhiyun     {
30*4882a593Smuzhiyun       if (grub_errno == GRUB_ERR_UNKNOWN_FS)
31*4882a593Smuzhiyun 	grub_errno = GRUB_ERR_NONE;
32*4882a593Smuzhiyun--
33*4882a593Smuzhiyun2.14.2
34*4882a593Smuzhiyun
35