From owner-svn-src-all@freebsd.org Thu Jan 31 11:36:29 2019
Return-Path: <owner-svn-src-all@freebsd.org>
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 D4FFB1359310;
Thu, 31 Jan 2019 11:36:29 +0000 (UTC)
(envelope-from avos@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 7505288C1E;
Thu, 31 Jan 2019 11:36:29 +0000 (UTC)
(envelope-from avos@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 688206CCF;
Thu, 31 Jan 2019 11:36:29 +0000 (UTC)
(envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0VBaT3B032674;
Thu, 31 Jan 2019 11:36:29 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0VBaT41032673;
Thu, 31 Jan 2019 11:36:29 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201901311136.x0VBaT41032673@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Thu, 31 Jan 2019 11:36:29 +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: r343605 - in stable: 10/sys/geom/uzip 11/sys/geom/uzip
12/sys/geom/uzip
X-SVN-Group: stable-12
X-SVN-Commit-Author: avos
X-SVN-Commit-Paths: in stable: 10/sys/geom/uzip 11/sys/geom/uzip
12/sys/geom/uzip
X-SVN-Commit-Revision: 343605
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 7505288C1E
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
NEURAL_HAM_SHORT(-0.96)[-0.962,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-0.999,0]
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" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Jan 2019 11:36:30 -0000
Author: avos
Date: Thu Jan 31 11:36:28 2019
New Revision: 343605
URL: https://svnweb.freebsd.org/changeset/base/343605
Log:
MFC r343473:
geom_uzip(4): move NULL pointer KASSERT check before it is dereferenced
PR: 203499
Submitted by: <chadf@triularity.org>
MFC r343475:
geom_uzip(4): set 'gp != NULL' assertion on top of the function
There was yet another access to this variable in g_trace() few
lines upper.
PR: 203499
Reported by: cem
Modified:
stable/12/sys/geom/uzip/g_uzip.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sys/geom/uzip/g_uzip.c
stable/11/sys/geom/uzip/g_uzip.c
Directory Properties:
stable/10/ (props changed)
stable/11/ (props changed)
Modified: stable/12/sys/geom/uzip/g_uzip.c
==============================================================================
--- stable/12/sys/geom/uzip/g_uzip.c Thu Jan 31 11:12:31 2019 (r343604)
+++ stable/12/sys/geom/uzip/g_uzip.c Thu Jan 31 11:36:28 2019 (r343605)
@@ -886,6 +886,7 @@ g_uzip_destroy_geom(struct gctl_req *req, struct g_cla
{
struct g_provider *pp;
+ KASSERT(gp != NULL, ("NULL geom"));
g_trace(G_T_TOPOLOGY, "%s(%s, %s)", __func__, mp->name, gp->name);
g_topology_assert();
@@ -895,7 +896,6 @@ g_uzip_destroy_geom(struct gctl_req *req, struct g_cla
return (ENXIO);
}
- KASSERT(gp != NULL, ("NULL geom"));
pp = LIST_FIRST(&gp->provider);
KASSERT(pp != NULL, ("NULL provider"));
if (pp->acr > 0 || pp->acw > 0 || pp->ace > 0)