From owner-svn-src-head@freebsd.org Wed Jan 10 05:06:22 2018 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 7C85BE67A15; Wed, 10 Jan 2018 05:06:22 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 580B482BFB; Wed, 10 Jan 2018 05:06:22 +0000 (UTC) (envelope-from markj@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 8FE4C2128E; Wed, 10 Jan 2018 05:06:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0A56LYj005132; Wed, 10 Jan 2018 05:06:21 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0A56Lp7005131; Wed, 10 Jan 2018 05:06:21 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201801100506.w0A56Lp7005131@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 10 Jan 2018 05:06:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327760 - head/sys/geom/mirror X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/geom/mirror X-SVN-Commit-Revision: 327760 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 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: Wed, 10 Jan 2018 05:06:22 -0000 Author: markj Date: Wed Jan 10 05:06:21 2018 New Revision: 327760 URL: https://svnweb.freebsd.org/changeset/base/327760 Log: Avoid referencing a possibly freed consumer after r327496. g_mirror_regular_request() may free the gmirror consumer for a disk if that disk is being disconnected, after which we must not dereference the consumer pointer. CID: 1384280 X-MFC with: r327496 Modified: head/sys/geom/mirror/g_mirror.c Modified: head/sys/geom/mirror/g_mirror.c ============================================================================== --- head/sys/geom/mirror/g_mirror.c Wed Jan 10 02:57:22 2018 (r327759) +++ head/sys/geom/mirror/g_mirror.c Wed Jan 10 05:06:21 2018 (r327760) @@ -906,16 +906,12 @@ g_mirror_done(struct bio *bp) } static void -g_mirror_regular_request_error(struct g_mirror_softc *sc, struct bio *bp) +g_mirror_regular_request_error(struct g_mirror_softc *sc, + struct g_mirror_disk *disk, struct bio *bp) { - struct g_mirror_disk *disk; - disk = bp->bio_from->private; - if (bp->bio_cmd == BIO_FLUSH && bp->bio_error == EOPNOTSUPP) return; - if (disk == NULL) - return; if ((disk->d_flags & G_MIRROR_DISK_FLAG_BROKEN) == 0) { disk->d_flags |= G_MIRROR_DISK_FLAG_BROKEN; @@ -942,6 +938,7 @@ g_mirror_regular_request_error(struct g_mirror_softc * static void g_mirror_regular_request(struct g_mirror_softc *sc, struct bio *bp) { + struct g_mirror_disk *disk; struct bio *pbp; g_topology_assert_not(); @@ -952,7 +949,8 @@ g_mirror_regular_request(struct g_mirror_softc *sc, st bp->bio_from->index--; if (bp->bio_cmd == BIO_WRITE || bp->bio_cmd == BIO_DELETE) sc->sc_writes--; - if (bp->bio_from->private == NULL) { + disk = bp->bio_from->private; + if (disk == NULL) { g_topology_lock(); g_mirror_kill_consumer(sc, bp->bio_from); g_topology_unlock(); @@ -999,7 +997,8 @@ g_mirror_regular_request(struct g_mirror_softc *sc, st } else if (bp->bio_error != 0) { if (pbp->bio_error == 0) pbp->bio_error = bp->bio_error; - g_mirror_regular_request_error(sc, bp); + if (disk != NULL) + g_mirror_regular_request_error(sc, disk, bp); switch (pbp->bio_cmd) { case BIO_DELETE: case BIO_WRITE: