]> git.proxmox.com Git - mirror_zfs.git/commitdiff
libzfs_sendrecv: Initialize in case of failure
authorRyan Moeller <freqlabs@FreeBSD.org>
Thu, 5 Aug 2021 15:32:57 +0000 (15:32 +0000)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 2 Feb 2022 01:02:58 +0000 (17:02 -0800)
In zfs_send_progress, initialize \*bytes_written and \*blocks_visited
in case we have to return early due to ioctl failure.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes #12967

lib/libzfs/libzfs_sendrecv.c

index fea49e3ab1b3acf0609ac1c7a1a6b426acf06b9e..d1538d14667e75375ca224d6c0f6c7389d6f2b7f 100644 (file)
@@ -883,6 +883,10 @@ zfs_send_progress(zfs_handle_t *zhp, int fd, uint64_t *bytes_written,
 {
        zfs_cmd_t zc = {"\0"};
 
+       if (bytes_written != NULL)
+               *bytes_written = 0;
+       if (blocks_visited != NULL)
+               *blocks_visited = 0;
        (void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));
        zc.zc_cookie = fd;
        if (zfs_ioctl(zhp->zfs_hdl, ZFS_IOC_SEND_PROGRESS, &zc) != 0)