[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/10] normal/completion: Fix possible NULL pointer dereference
From: |
Javier Martinez Canillas |
Subject: |
[PATCH 05/10] normal/completion: Fix possible NULL pointer dereference |
Date: |
Tue, 25 Feb 2020 13:25:48 +0100 |
From: Peter Jones <address@hidden>
Coverity Scan reports that the grub_strrchr() function can return NULL if
the character is not found. Check if that's the case for dirfile pointer.
Signed-off-by: Peter Jones <address@hidden>
Signed-off-by: Javier Martinez Canillas <address@hidden>
---
grub-core/normal/completion.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
index 596102848c1..c07100a8de3 100644
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -284,7 +284,8 @@ complete_file (void)
/* Cut away the filename part. */
dirfile = grub_strrchr (dir, '/');
- dirfile[1] = '\0';
+ if (dirfile)
+ dirfile[1] = '\0';
/* Iterate the directory. */
(fs->fs_dir) (dev, dir, iterate_dir, NULL);
--
2.24.1
- [PATCH 00/10] A set of trivial patches from the Fedora package, Javier Martinez Canillas, 2020/02/25
- [PATCH 01/10] linux/getroot: Handle rssd storage device names, Javier Martinez Canillas, 2020/02/25
- [PATCH 02/10] efi: Print more debug info in our module loader, Javier Martinez Canillas, 2020/02/25
- [PATCH 03/10] Makefile: Make libgrub.pp depend on config-util.h, Javier Martinez Canillas, 2020/02/25
- [PATCH 04/10] kern: Add grub_debug_enabled(), Javier Martinez Canillas, 2020/02/25
- [PATCH 05/10] normal/completion: Fix possible NULL pointer dereference,
Javier Martinez Canillas <=
- [PATCH 07/10] efi/uga: Use 64 bit for fb_base, Javier Martinez Canillas, 2020/02/25
- [PATCH 08/10] kern: Make grub_error() more verbose, Javier Martinez Canillas, 2020/02/25
- [PATCH 06/10] efi/gop: Add support for BLT_ONLY adapters, Javier Martinez Canillas, 2020/02/25
- [PATCH 10/10] efi: Fix the type of grub_efi_status_t, Javier Martinez Canillas, 2020/02/25
- [PATCH 09/10] video: Add more debug output on GOP and UGA probing, Javier Martinez Canillas, 2020/02/25
- Re: [PATCH 00/10] A set of trivial patches from the Fedora package, Daniel Kiper, 2020/02/28