From nobody Wed Jul 02 18:28:09 2025 X-Original-To: dev-commits-src-branches@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 4bXT0p34myz60mLc; Wed, 02 Jul 2025 18:28:10 +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 4bXT0p0lmlz3HhT; Wed, 02 Jul 2025 18:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751480890; 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=XoGc6qhIwkefrRmp1pVXsHPyVtDIPbqTM97OcAvLi8U=; b=tBVFQj8/3kzT+v4qIVStkn5pddkFdZrf4JbZE7t2nxTF/uwB1dgf6GQvspqypmP12TxyaT fxgCGxt0RxGaRKq04GT7jCWxRSpkhWpFaspgGULlScMp8yUYLWYqfxXlr2ntrOyfSb0Xyu U08vZwmfFCAzNrjgZVlDGk4fLkaXKo5c0kixoJ0mK4eLlolbIqClQ2xBoDadjj9Gi7XGcH yd2SlOofe2LF908G2KGqdBy6xaTPxIIG7I3Kn3nKSuyS8i/NCbD/A6jbgRPZ2vXEtEiEkE JlmdlRbKqPscWbrBk8+6YkooA+kfxqjtGagNivGghZfn7kXfePOXronJXaVl7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751480890; 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=XoGc6qhIwkefrRmp1pVXsHPyVtDIPbqTM97OcAvLi8U=; b=mHIUGeqR0e4NZ9Qd6SMhI09p1Ctlqlsq+NruTqw83v9drK2YBCi+AhfpwI5JHYLuRt8dQA 03otzvM6N0dEvE4TpXhBD0kJS5TS6+LDDjMukuR8avUsa8VR19C2wgDU4EL4ZDM4r7aH83 Cc/bgIAa4e1AbrLomAbeEQQSHAakFXza/77G7VaEPIVnIM4b4ZC/acX25gLd76zMZq0ga4 nlovROj4Jx7Y0CGHxnrDXhG7NKCeS2uJKGW22sZQOTY+w9Xr2EiuflwLlSB+RVhx1pvT5r PfHJuIGx60CO09ul52uCY9dmQOge2iDO61iY4W/kr46P0qd+mZ72KhAJ3hJLpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751480890; a=rsa-sha256; cv=none; b=e3t/fyrF52zBdT5Deo9CnzaqajR8VFZzpW/yQMnq5xFHv89svja+cxCi2fkwyCzPCUk8KT Dc2QDUtOx5zcfbAiUbWjBU1iMoh586Ddb6n7OTA4ZuH4UJIj6jDKcy8CqXASqAOqzytj51 PvfOHrr3i8yWc7XXV1VKq/wCmu1YkqPtT7OMWB9zcQ0jReXfHDHyac2n4x3DfYMfTbUMoO 9K70haJoiATnbQrRMCVHZSWmb4xIQm/ASaJCh6VD535PrAIueaNiP2vF/OOo7uufOVBonB PMxllxkBC2faO1ieEj24RJ8mWurTDCq0ju7nnPKFpazvWXBSGvro5uo23oKhlQ== 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 4bXT0p00C4zWGl; Wed, 02 Jul 2025 18:28:09 +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 562IS9sh057358; Wed, 2 Jul 2025 18:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562IS9CW057355; Wed, 2 Jul 2025 18:28:09 GMT (envelope-from git) Date: Wed, 2 Jul 2025 18:28:09 GMT Message-Id: <202507021828.562IS9CW057355@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: c5feebf38389 - releng/14.2 - Fix corruption in ZFS replication streams from encrypted datasets. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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.2 X-Git-Reftype: branch X-Git-Commit: c5feebf38389901b4b22ac94244ce33e9e6234ca Auto-Submitted: auto-generated The branch releng/14.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=c5feebf38389901b4b22ac94244ce33e9e6234ca commit c5feebf38389901b4b22ac94244ce33e9e6234ca Author: Gordon Tetlow AuthorDate: 2025-07-02 05:51:04 +0000 Commit: Gordon Tetlow CommitDate: 2025-07-02 05:51:04 +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 37c68528bf95..23ab482941e7 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); }