From nobody Wed Jul 2 18:28:29 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 4bXT1954Mtz60mBK; Wed, 02 Jul 2025 18:28:29 +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 4bXT1931mqz3HyJ; Wed, 02 Jul 2025 18:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751480909; 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=g7PwIp2HkUQmiTEPWKvfwx4G9C4tenA9AOD7w3XeoPU=; b=SaXUJ6cfS4fCqRwBzRSP1G3nvwuyeaH7VegfBA8e+gauK8R50afezxyUJhVgW9WpWH7BQz 8vEGCxUm9oI2q52U/3Wtrz8RGKz+h86MhBiGN+tdymZRBY44fIHjJqIRM794np+2SuFcbs s15MCWzT6yu16uOtEX0eSQr1k3UIEjn0Ollwvnwfka1SblPlUG4jAKxfI4/CxGwhRTnBzY V70Z127r+B5qaWEMF/fGtjmn8MloL2Hj9btHvV3sDCVBh+fcTLlY76QWLMHmx/dFWuyRTv msIsyTYITqWLNssrwDW9+RdwaUXvgUB7yQ7D7R44qo1gVqkul6TTuQRsHk4iTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751480909; 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=g7PwIp2HkUQmiTEPWKvfwx4G9C4tenA9AOD7w3XeoPU=; b=cQFmsSG9D9zwJxLiLaoZ0BN4V7uBz3sKP8w/UblXvlArmsDceeK3SDA/Oz2MiBNIBhw7Ls QfP9GrsV5bRRIp7phU0ON5FG5G2mY88BnyIrGkez192HbMze5IpZDHGEOshL1y38c0zphm Gv62JiMsf6O/u5zuYiUJtUNe50AGkzdrS5fIrLrENcI5bBLQip3fND7DAYcqWMIqLQKIap 7pu1+3rs9FWC1FcuOwGKoBVQYMUcYW5NOD4NQxsGTvqdg3fegKLNdmpo1gvLIHc4VFGfOh BYt5KhBPOZdU1P1EW/lxOz87Qog9MQtsTkpZVXWvrlWDA+4SPnzurnUh6YfEsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751480909; a=rsa-sha256; cv=none; b=epYK49VHgZpBawxsgNHGR8FrIG284sTc7gDfOsmFRc1GFGECmhwZUw9OlV4tW+OmsDs7h8 2Ddmh8izw0LYZP+5WcQ1LiQmXuZWwALgEtHR8JRwlfhp6mCPZjYwmYyCK8FbaCFSzfdIPX zZfI+Ng/ARh+J8qzwYgLNef49aMF2oXRmEUYoN9sDP+BrATa+a0jqTGWIgrWBAy/fx64CH JZe3zb42uQkpdh8TE0UOVBRcVNEYMBk+XNQcEQwjSksfE/fGLUMVqcio0j58WTP0HBFrk7 vLAi0t7w5c+HYawnRrG+a0PcMfYeL1wq2xlGq+chNmAwR8QXFpF33Ol3V1ZhIg== 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 4bXT192crHzW9X; Wed, 02 Jul 2025 18:28:29 +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 562ISTCB057749; Wed, 2 Jul 2025 18:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562ISTLP057746; Wed, 2 Jul 2025 18:28:29 GMT (envelope-from git) Date: Wed, 2 Jul 2025 18:28:29 GMT Message-Id: <202507021828.562ISTLP057746@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: 4d9c4ecf6a48 - releng/13.5 - 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/13.5 X-Git-Reftype: branch X-Git-Commit: 4d9c4ecf6a48a17f9b79a93ec80e09858f80a524 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=4d9c4ecf6a48a17f9b79a93ec80e09858f80a524 commit 4d9c4ecf6a48a17f9b79a93ec80e09858f80a524 Author: Gordon Tetlow AuthorDate: 2025-07-02 05:47:29 +0000 Commit: Gordon Tetlow CommitDate: 2025-07-02 05:47:29 +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 0dd1ec210a1d..e4891e2fe4aa 100644 --- a/sys/contrib/openzfs/module/zfs/dmu_send.c +++ b/sys/contrib/openzfs/module/zfs/dmu_send.c @@ -2676,8 +2676,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); @@ -2729,7 +2729,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); }