From owner-svn-src-all@freebsd.org Fri May 25 19:08:57 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A56DEEF179E; Fri, 25 May 2018 19:08:57 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 002ED6F45A; Fri, 25 May 2018 19:08:56 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id w4PJ8khd030235 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 25 May 2018 22:08:49 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua w4PJ8khd030235 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id w4PJ8kBW030234; Fri, 25 May 2018 22:08:46 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 25 May 2018 22:08:46 +0300 From: Konstantin Belousov To: Marcelo Araujo Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r334216 - head/usr.sbin/bhyve Message-ID: <20180525190846.GL88128@kib.kiev.ua> References: <201805251854.w4PIseSi073002@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201805251854.w4PIseSi073002@repo.freebsd.org> User-Agent: Mutt/1.10.0 (2018-05-17) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 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: Fri, 25 May 2018 19:08:57 -0000 On Fri, May 25, 2018 at 06:54:40PM +0000, Marcelo Araujo wrote: > Author: araujo > Date: Fri May 25 18:54:40 2018 > New Revision: 334216 > URL: https://svnweb.freebsd.org/changeset/base/334216 > > Log: > After a long discussion about assert(3), we gonna use a HardenedBSD > approach to chek strdup(3) memory allocation. > > Submitted by: Shaw Webb > Reported by: brooks > Obtained from: HardenedBSD > > Modified: > head/usr.sbin/bhyve/bhyverun.c > > Modified: head/usr.sbin/bhyve/bhyverun.c > ============================================================================== > --- head/usr.sbin/bhyve/bhyverun.c Fri May 25 18:11:13 2018 (r334215) > +++ head/usr.sbin/bhyve/bhyverun.c Fri May 25 18:54:40 2018 (r334216) > @@ -193,7 +193,8 @@ topology_parse(const char *opt) > c = 1, n = 1, s = 1, t = 1; > ns = false, scts = false; > str = strdup(opt); > - assert(str != NULL); > + if (str == NULL) > + goto out; > > while ((cp = strsep(&str, ",")) != NULL) { > if (sscanf(cp, "%i%n", &tmp, &chk) == 1) { > @@ -225,6 +226,7 @@ topology_parse(const char *opt) > goto out; > } > free(str); > + str = NULL; > > /* > * Range check 1 <= n <= UINT16_MAX all values > @@ -253,7 +255,8 @@ topology_parse(const char *opt) > return(0); > > out: > - free(str); > + if (str != NULL) This check is useless. Free(3) is fine handling NULL argument. > + free(str); > return (-1); > } >