From ae5f2ca7b9c50ce8de0f82f1b37ad885dadefc5b Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 24 Jul 2019 23:04:26 +0000
Subject: [PATCH] Fix several related coverity issues:

Make sure to always free shortopts and lopts when returning.
Fix minor logic bug to guard against NULLs properly.

CID: 1403654, 1403656, 1403658
---
 sbin/nvmecontrol/comnd.c   | 6 +++++-
 sbin/nvmecontrol/logpage.c | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sbin/nvmecontrol/comnd.c b/sbin/nvmecontrol/comnd.c
index 6298dabc1222..d264c10f4f86 100644
--- a/sbin/nvmecontrol/comnd.c
+++ b/sbin/nvmecontrol/comnd.c
@@ -155,7 +155,7 @@ find_long(struct option *lopts, int ch)
 
 	for (i = 0; lopts[i].val != ch && lopts[i].name != NULL; i++)
 		continue;
-	return i;
+	return (i);
 }
 
 int
@@ -251,6 +251,8 @@ arg_parse(int argc, char * const * argv, const struct cmd *f)
 			if (optind >= argc) {
 				fprintf(stderr, "Missing arg %s\n", args->descr);
 				arg_help(argc, argv, f);
+				free(lopts);
+				free(shortopts);
 				return (1);
 			}
 			*(char **)args->ptr = argv[optind++];
@@ -258,10 +260,12 @@ arg_parse(int argc, char * const * argv, const struct cmd *f)
 		}
 	}
 	free(lopts);
+	free(shortopts);
 	return (0);
 bad_arg:
 	fprintf(stderr, "Bad value to --%s: %s\n", opts[idx].long_arg, optarg);
 	free(lopts);
+	free(shortopts);
 	exit(1);
 }
 
diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c
index 5e9cfbee06b0..82ad976eee72 100644
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@@ -465,7 +465,7 @@ logpage(const struct cmd *f, int argc, char *argv[])
 		 * unless the vendors match.
 		 */
 		SLIST_FOREACH(lpf, &logpages, link) {
-			if (lpf->vendor != NULL && vendor != NULL &&
+			if (lpf->vendor == NULL || vendor == NULL ||
 			    strcmp(lpf->vendor, vendor) != 0)
 				continue;
 			if (opt.page != lpf->log_page)