Fix 0 byte memory leak in zfs receive

[zfs] / module / zfs / dmu_recv.c

diff --git a/module/zfs/dmu_recv.c b/module/zfs/dmu_recv.c
index 990f790256be4dcb5333e8b674fa988e5981a80e..4ac6f2f17f1447ce6b606cf13aadb1c35486a913 100644 (file)
--- a/module/zfs/dmu_recv.c
+++ b/module/zfs/dmu_recv.c
@@ -1323,13 +1323,15 @@ receive_object(struct receive_writer_arg *rwa, struct drr_object *drro,
 
        if (data != NULL) {
                dmu_buf_t *db;
+               dnode_t *dn;
                uint32_t flags = DMU_READ_NO_PREFETCH;
 
                if (rwa->raw)
                        flags |= DMU_READ_NO_DECRYPT;
 
-               VERIFY0(dmu_bonus_hold_impl(rwa->os, drro->drr_object,
-                   FTAG, flags, &db));
+               VERIFY0(dnode_hold(rwa->os, drro->drr_object, FTAG, &dn));
+               VERIFY0(dmu_bonus_hold_by_dnode(dn, FTAG, &db, flags));
+
                dmu_buf_will_dirty(db, tx);
 
                ASSERT3U(db->db_size, >=, drro->drr_bonuslen);
@@ -1346,6 +1348,7 @@ receive_object(struct receive_writer_arg *rwa, struct drr_object *drro,
                            DRR_OBJECT_PAYLOAD_SIZE(drro));
                }
                dmu_buf_rele(db, FTAG);
+               dnode_rele(dn, FTAG);
        }
        dmu_tx_commit(tx);
 
@@ -1436,7 +1439,12 @@ receive_write(struct receive_writer_arg *rwa, struct drr_write *drrw,
        }
 
        VERIFY0(dnode_hold(rwa->os, drrw->drr_object, FTAG, &dn));
-       dmu_assign_arcbuf_by_dnode(dn, drrw->drr_offset, abuf, tx);
+       err = dmu_assign_arcbuf_by_dnode(dn, drrw->drr_offset, abuf, tx);
+       if (err != 0) {
+               dnode_rele(dn, FTAG);
+               dmu_tx_commit(tx);
+               return (err);
+       }
        dnode_rele(dn, FTAG);
 
        /*
@@ -1777,6 +1785,8 @@ receive_read_payload_and_next_header(struct receive_arg *ra, int len, void *buf)
                        ra->rrd->payload_size = len;
                        ra->rrd->bytes_read = ra->bytes_read;
                }
+       } else {
+               ASSERT3P(buf, ==, NULL);
        }
 
        ra->prev_cksum = ra->cksum;
@@ -1928,9 +1938,12 @@ receive_read_record(struct receive_arg *ra)
        {
                struct drr_object *drro = &ra->rrd->header.drr_u.drr_object;
                uint32_t size = DRR_OBJECT_PAYLOAD_SIZE(drro);
-               void *buf = kmem_zalloc(size, KM_SLEEP);
+               void *buf = NULL;
                dmu_object_info_t doi;
 
+               if (size != 0)
+                       buf = kmem_zalloc(size, KM_SLEEP);
+
                err = receive_read_payload_and_next_header(ra, size, buf);
                if (err != 0) {
                        kmem_free(buf, size);