From owner-svn-src-all@freebsd.org Mon Aug 12 18:56:12 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BEFEFBD86A; Mon, 12 Aug 2019 18:56:12 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 466lRw4X22z3JYx; Mon, 12 Aug 2019 18:56:12 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7CE6E3002; Mon, 12 Aug 2019 18:56:12 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7CIuC3L065348; Mon, 12 Aug 2019 18:56:12 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7CIuCHB065346; Mon, 12 Aug 2019 18:56:12 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201908121856.x7CIuCHB065346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 12 Aug 2019 18:56:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r350938 - stable/12/sbin/nvmecontrol X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/12/sbin/nvmecontrol X-SVN-Commit-Revision: 350938 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Aug 2019 18:56:12 -0000 Author: mav Date: Mon Aug 12 18:56:11 2019 New Revision: 350938 URL: https://svnweb.freebsd.org/changeset/base/350938 Log: MFC r350309 (by imp): 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 Modified: stable/12/sbin/nvmecontrol/comnd.c stable/12/sbin/nvmecontrol/logpage.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/nvmecontrol/comnd.c ============================================================================== --- stable/12/sbin/nvmecontrol/comnd.c Mon Aug 12 18:55:36 2019 (r350937) +++ stable/12/sbin/nvmecontrol/comnd.c Mon Aug 12 18:56:11 2019 (r350938) @@ -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 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 } } 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); } Modified: stable/12/sbin/nvmecontrol/logpage.c ============================================================================== --- stable/12/sbin/nvmecontrol/logpage.c Mon Aug 12 18:55:36 2019 (r350937) +++ stable/12/sbin/nvmecontrol/logpage.c Mon Aug 12 18:56:11 2019 (r350938) @@ -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)