From 10891b37fa8f2cbf71ec529fc3808113d94d52ef Mon Sep 17 00:00:00 2001 From: ixhamza <106930537+ixhamza@users.noreply.github.com> Date: Thu, 16 Jun 2022 02:26:12 +0500 Subject: [PATCH] libzfs: Prevent overridding of error code zfs_send_cb_impl fails to report error for some flags. Use second error variable for send_conclusion_record. Reviewed-by: Ryan Moeller Reviewed-by: Brian Behlendorf Signed-off-by: Ameer Hamza Closes #13558 --- lib/libzfs/libzfs_sendrecv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c index f7b2a0e87..a27446f54 100644 --- a/lib/libzfs/libzfs_sendrecv.c +++ b/lib/libzfs/libzfs_sendrecv.c @@ -2366,9 +2366,9 @@ zfs_send_cb_impl(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap, * there was some error, because it might not be totally * failed. */ - err = send_conclusion_record(outfd, NULL); - if (err != 0) - return (zfs_standard_error(zhp->zfs_hdl, err, errbuf)); + int err2 = send_conclusion_record(outfd, NULL); + if (err2 != 0) + return (zfs_standard_error(zhp->zfs_hdl, err2, errbuf)); } return (err || sdd.err);