1From 5d5391b0a05abe76e04c1eb68dcc6cbef5326c4a Mon Sep 17 00:00:00 2001 2From: Darren Kenny <darren.kenny@oracle.com> 3Date: Tue, 8 Dec 2020 21:47:13 +0000 4Subject: [PATCH] loader/bsd: Check for NULL arg up-front 5 6The code in the next block suggests that it is possible for .set to be 7true but .arg may still be NULL. 8 9This code assumes that it is never NULL, yet later is testing if it is 10NULL - that is inconsistent. 11 12So we should check first if .arg is not NULL, and remove this check that 13is being flagged by Coverity since it is no longer required. 14 15Fixes: CID 292471 16 17Signed-off-by: Darren Kenny <darren.kenny@oracle.com> 18Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 19Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 20--- 21 grub-core/loader/i386/bsd.c | 4 ++-- 22 1 file changed, 2 insertions(+), 2 deletions(-) 23 24diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c 25index b92cbe9..8432283 100644 26--- a/grub-core/loader/i386/bsd.c 27+++ b/grub-core/loader/i386/bsd.c 28@@ -1605,7 +1605,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) 29 kernel_type = KERNEL_TYPE_OPENBSD; 30 bootflags = grub_bsd_parse_flags (ctxt->state, openbsd_flags); 31 32- if (ctxt->state[OPENBSD_ROOT_ARG].set) 33+ if (ctxt->state[OPENBSD_ROOT_ARG].set && ctxt->state[OPENBSD_ROOT_ARG].arg != NULL) 34 { 35 const char *arg = ctxt->state[OPENBSD_ROOT_ARG].arg; 36 unsigned type, unit, part; 37@@ -1622,7 +1622,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) 38 "unknown disk type name"); 39 40 unit = grub_strtoul (arg, (char **) &arg, 10); 41- if (! (arg && *arg >= 'a' && *arg <= 'z')) 42+ if (! (*arg >= 'a' && *arg <= 'z')) 43 return grub_error (GRUB_ERR_BAD_ARGUMENT, 44 "only device specifications of form " 45 "<type><number><lowercase letter> are supported"); 46-- 472.14.2 48 49