From owner-svn-src-head@freebsd.org Sun Apr 3 16:59:49 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4653B01979; Sun, 3 Apr 2016 16:59:49 +0000 (UTC) (envelope-from kevlo@ns.kevlo.org) Received: from ns.kevlo.org (220-135-115-6.HINET-IP.hinet.net [220.135.115.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "ns.kevlo.org", Issuer "ns.kevlo.org" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4172518B1; Sun, 3 Apr 2016 16:59:48 +0000 (UTC) (envelope-from kevlo@ns.kevlo.org) Received: from ns.kevlo.org (localhost [127.0.0.1]) by ns.kevlo.org (8.15.2/8.15.2) with ESMTPS id u33GwSJU024865 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 4 Apr 2016 00:58:29 +0800 (CST) (envelope-from kevlo@ns.kevlo.org) Received: (from kevlo@localhost) by ns.kevlo.org (8.15.2/8.15.2/Submit) id u33GwSVd024864; Mon, 4 Apr 2016 00:58:28 +0800 (CST) (envelope-from kevlo) Date: Mon, 4 Apr 2016 00:58:27 +0800 From: Kevin Lo To: "Pedro F. Giffuni" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r297526 - head/sys/geom/sched Message-ID: <20160403165827.GA24850@ns.kevlo.org> References: <201604031625.u33GPpnK088911@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201604031625.u33GPpnK088911@repo.freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Apr 2016 16:59:49 -0000 On Sun, Apr 03, 2016 at 04:25:51PM +0000, Pedro F. Giffuni wrote: > > Author: pfg > Date: Sun Apr 3 16:25:51 2016 > New Revision: 297526 > URL: https://svnweb.freebsd.org/changeset/base/297526 > > Log: > g_sched_destroy(): prevent return of uninitialized scalar variable. > > For the !gsp case there some chance of returning an uninitialized > return value. Prevent that from happening by initializing the > error value. Hmm, wouldn't it be better to initialize 'error' before use? Index: sys/geom/sched/g_sched.c =================================================================== --- sys/geom/sched/g_sched.c (revision 297527) +++ sys/geom/sched/g_sched.c (working copy) @@ -1236,7 +1236,7 @@ g_sched_destroy(struct g_geom *gp, boolean_t force struct g_provider *pp, *oldpp = NULL; struct g_sched_softc *sc; struct g_gsched *gsp; - int error; + int error = 0; g_topology_assert(); sc = gp->softc; @@ -1316,8 +1316,7 @@ g_sched_destroy(struct g_geom *gp, boolean_t force gsp->gs_fini(sc->sc_data); g_gsched_unref(gsp); sc->sc_gsched = NULL; - } else - error = 0; + } if ((sc->sc_flags & G_SCHED_PROXYING) && oldpp) { error = g_destroy_proxy(gp, oldpp); > > CID: 1006421 > > Modified: > head/sys/geom/sched/g_sched.c > > Modified: head/sys/geom/sched/g_sched.c > ============================================================================== > --- head/sys/geom/sched/g_sched.c Sun Apr 3 14:40:54 2016 (r297525) > +++ head/sys/geom/sched/g_sched.c Sun Apr 3 16:25:51 2016 (r297526) > @@ -1316,7 +1316,8 @@ g_sched_destroy(struct g_geom *gp, boole > gsp->gs_fini(sc->sc_data); > g_gsched_unref(gsp); > sc->sc_gsched = NULL; > - } > + } else > + error = 0; > > if ((sc->sc_flags & G_SCHED_PROXYING) && oldpp) { > error = g_destroy_proxy(gp, oldpp); > >