From owner-svn-src-all@freebsd.org Fri Jul 26 01:47:21 2019
Return-Path: <owner-svn-src-all@freebsd.org>
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 854D1B32E7;
Fri, 26 Jul 2019 01:47:21 +0000 (UTC)
(envelope-from kevans@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 673E56FFE5;
Fri, 26 Jul 2019 01:47:21 +0000 (UTC)
(envelope-from kevans@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 3A0C87CCE;
Fri, 26 Jul 2019 01:47:21 +0000 (UTC)
(envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6Q1lLfT081199;
Fri, 26 Jul 2019 01:47:21 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6Q1lLJf081198;
Fri, 26 Jul 2019 01:47:21 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201907260147.x6Q1lLJf081198@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 26 Jul 2019 01:47:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r350342 - in stable: 11/stand/libsa/zfs 12/stand/libsa/zfs
X-SVN-Group: stable-11
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: in stable: 11/stand/libsa/zfs 12/stand/libsa/zfs
X-SVN-Commit-Revision: 350342
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 673E56FFE5
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.91 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-1.000,0];
NEURAL_HAM_SHORT(-0.91)[-0.915,0];
NEURAL_HAM_LONG(-1.00)[-1.000,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
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: Fri, 26 Jul 2019 01:47:21 -0000
Author: kevans
Date: Fri Jul 26 01:47:20 2019
New Revision: 350342
URL: https://svnweb.freebsd.org/changeset/base/350342
Log:
MFC r348471: stand: zfs: Free bouncebuf on error path in vdev_read
r344226 inadvertently added this path in which we return from failure on an
lseek and do not free bouncebuf on the way out.
Modified:
stable/11/stand/libsa/zfs/zfs.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/stand/libsa/zfs/zfs.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/stand/libsa/zfs/zfs.c
==============================================================================
--- stable/11/stand/libsa/zfs/zfs.c Fri Jul 26 01:45:00 2019 (r350341)
+++ stable/11/stand/libsa/zfs/zfs.c Fri Jul 26 01:47:20 2019 (r350342)
@@ -425,8 +425,10 @@ vdev_read(vdev_t *vdev, void *priv, off_t offset, void
}
}
- if (lseek(fd, start_sec * secsz, SEEK_SET) == -1)
- return (errno);
+ if (lseek(fd, start_sec * secsz, SEEK_SET) == -1) {
+ ret = errno;
+ goto error;
+ }
/* Partial data return from first sector */
if (head > 0) {