[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/12] normal/completion: Fix possible NULL pointer dereferenc
From: |
Javier Martinez Canillas |
Subject: |
[PATCH v2 05/12] normal/completion: Fix possible NULL pointer dereference |
Date: |
Wed, 4 Mar 2020 12:58:44 +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>
Reviewed-by: Daniel Kiper <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 v2 00/12] A set of trivial patches from the Fedora package, Javier Martinez Canillas, 2020/03/04
- [PATCH v2 01/12] linux/getroot: Handle rssd storage device names, Javier Martinez Canillas, 2020/03/04
- [PATCH v2 02/12] efi: Print more debug info in our module loader, Javier Martinez Canillas, 2020/03/04
- [PATCH v2 03/12] Makefile: Make libgrub.pp depend on config-util.h, Javier Martinez Canillas, 2020/03/04
- [PATCH v2 05/12] normal/completion: Fix possible NULL pointer dereference,
Javier Martinez Canillas <=
- [PATCH v2 04/12] kern: Add grub_debug_enabled(), Javier Martinez Canillas, 2020/03/04
- [PATCH v2 06/12] efi/gop: Add support for BLT_ONLY adapters, Javier Martinez Canillas, 2020/03/04
- [PATCH v2 07/12] efi/uga: Use 64 bit for fb_base, Javier Martinez Canillas, 2020/03/04
- [PATCH v2 09/12] efi: Print error messages to grub_efi_allocate_pages_real(), Javier Martinez Canillas, 2020/03/04
- [PATCH v2 11/12] efi/gop: Add debug output on GOP probing, Javier Martinez Canillas, 2020/03/04
- [PATCH v2 08/12] kern: Make grub_error() more verbose, Javier Martinez Canillas, 2020/03/04