From nobody Wed Jul 2 18:27:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bXT0J5MNbz60m7n; Wed, 02 Jul 2025 18:27:44 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXT0J4rGxz3H0J; Wed, 02 Jul 2025 18:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751480864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i4refpiXSW4kGmM9j9xXhCjWgzom0tIJDUVtJz28U90=; b=xcy1k65dMKVDq0qhkLlhvBDhbEzZhLMkgAzPVKLZhIOF7dn2gsHZBOHWlxXyt9z2vYg8lv 2ol+sCgAowGJpDW51vsfboSixPDuvl/vbw59BR0jYztJaxTgabovXgWRpExlhal6keKBYj XFrJYlf5CViEBXL0LulrYrJhqDYPfsIUFvoRJw4zbILx5UCej/SPB/iluebbGHAtl7cgP3 Lq+9R0e1MGbZhfhhJeIX3SGiqDTDbNitYmoAA9FdkqFk4QuyjH/2LK8vPhp7PaijSeOv/g 9+T8EP4opV24hVWVVI3FUAb1BazFZxr+g4FphKnWgOfBN18y0nrfCTK+zp9dRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751480864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i4refpiXSW4kGmM9j9xXhCjWgzom0tIJDUVtJz28U90=; b=bxv6PYX+uzFc8wUmktfaJKdtOGbWc/X/0OCtGw4EyH3xaWJx1kJVE45PKTRDzWdxwMRedi YU+WDqDRtNuSdLEZ2eaIQ1CLj7QxyOyZQ5mHVNqbfw/5r+Td6oVjed61ogg9lkOMmMrGbK mTyoeAaJBy+8Txx/KRWQscFiPdduclPvzNFx+9GdYZdTlcT7inzyvy3DSeMUc1exLCZKeO jraRXODqqn9WTT/+8cjFHRu8IFyl6B7Y9FxL5saM/fWY6Dr2ApJWMoiUpmeO5jJVD1g+bb 0DZK7F/rIhTBpcF32zWkfjiOm+KAAmdZHadi5lAKwY//ckU6KQ5xSobB6R1yBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751480864; a=rsa-sha256; cv=none; b=Xz711H1fz+VGez5Du4sib+gWelQaz91jyqsaf1HQI8soHUAfaVI3wTQ0LKu1vXGjsTn9GM V/UugIGOAeYzhpRYH8+3sFEI6jLe+fM+aV+4E5EBTYxLwkIA9b3mJpfyMLeMMPhGJ7d45P oIhlH7Jzt+oXwtEkk1mQOLDMiQKlLZ92AmK/NnN16s6I2I8azrXxmQWiwvaKzOo/IsStHn WAyAvpNsjcw5/uFVV4bM1qdQjEGV4G/jZV7SsrInGFK+Cyy6tN6BFVVOh7MRzf77wosTXz Pnt7kq1czVjp4waYvxRsg3T/0oKWFpV73wKYgJhsIh+xErQH3ecKJtFcpKdWjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bXT0J3nNkzW9T; Wed, 02 Jul 2025 18:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 562IRiBJ056990; Wed, 2 Jul 2025 18:27:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562IRiCE056987; Wed, 2 Jul 2025 18:27:44 GMT (envelope-from git) Date: Wed, 2 Jul 2025 18:27:44 GMT Message-Id: <202507021827.562IRiCE056987@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: cb24a62cd75b - releng/14.3 - Fix corruption in ZFS replication streams from encrypted datasets. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: cb24a62cd75b582c53f5bd600650bddd09a0ee89 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=cb24a62cd75b582c53f5bd600650bddd09a0ee89 commit cb24a62cd75b582c53f5bd600650bddd09a0ee89 Author: Gordon Tetlow AuthorDate: 2025-07-02 05:51:38 +0000 Commit: Gordon Tetlow CommitDate: 2025-07-02 05:51:38 +0000 Fix corruption in ZFS replication streams from encrypted datasets. From the upstream pull request merges: #17340 b144b160b Fix 2 bugs in non-raw send with encryption Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-25:10.zfs --- sys/contrib/openzfs/module/zfs/dmu_send.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/dmu_send.c b/sys/contrib/openzfs/module/zfs/dmu_send.c index 30d2ca5d6aa2..716b1b1f778c 100644 --- a/sys/contrib/openzfs/module/zfs/dmu_send.c +++ b/sys/contrib/openzfs/module/zfs/dmu_send.c @@ -2669,8 +2669,8 @@ dmu_send_obj(const char *pool, uint64_t tosnap, uint64_t fromsnap, } if (fromsnap != 0) { - err = dsl_dataset_hold_obj_flags(dspp.dp, fromsnap, dsflags, - FTAG, &fromds); + err = dsl_dataset_hold_obj(dspp.dp, fromsnap, FTAG, &fromds); + if (err != 0) { dsl_dataset_rele_flags(dspp.to_ds, dsflags, FTAG); dsl_pool_rele(dspp.dp, FTAG); @@ -2722,7 +2722,7 @@ dmu_send_obj(const char *pool, uint64_t tosnap, uint64_t fromsnap, kmem_free(dspp.fromredactsnaps, dspp.numfromredactsnaps * sizeof (uint64_t)); - dsl_dataset_rele(dspp.to_ds, FTAG); + dsl_dataset_rele_flags(dspp.to_ds, dsflags, FTAG); return (err); }