12345678910111213141516171819202122232425262728293031323334 |
- From 6afbe6063c95b827372f9ec310c9fc7461311eb1 Mon Sep 17 00:00:00 2001
- From: Daniel Axtens <dja@axtens.net>
- 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 <dja@axtens.net>
- Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
- Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
- ---
- 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 5b7491a..326d2d6 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;
- --
- 2.14.2
|