git: 4d9c4ecf6a48 - releng/13.5 - Fix corruption in ZFS replication streams from encrypted datasets.

[Gordon Tetlow]

The branch releng/13.5 has been updated by gordon:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=4d9c4ecf6a48a17f9b79a93ec80e09858f80a524

commit 4d9c4ecf6a48a17f9b79a93ec80e09858f80a524
Author:     Gordon Tetlow <gor...@freebsd.org>
AuthorDate: 2025-07-02 05:47:29 +0000
Commit:     Gordon Tetlow <gor...@freebsd.org>
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);
 }