svn commit: r282473 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Andriy Gapon
avg at FreeBSD.org
Tue May 5 10:56:17 UTC 2015
Author: avg
Date: Tue May 5 10:56:16 2015
New Revision: 282473
URL: https://svnweb.freebsd.org/changeset/base/282473
Log:
dmu_recv_end_check: don't leak hold if dsl_destroy_snapshot_check_impl fails
The leak may happen if !drc_newfs && drc_force and there is an error
iterating through snapshots or any of snapshot checks fails.
See https://www.illumos.org/issues/5870
See https://reviews.csiden.org/r/206/
Reviewed by: mahrens (as mahrens at delphix.com)
MFC after: 15 days
Sponsored by: ClusterHQ
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Tue May 5 10:44:17 2015 (r282472)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Tue May 5 10:56:16 2015 (r282473)
@@ -2010,7 +2010,7 @@ dmu_recv_end_check(void *arg, dmu_tx_t *
error = dsl_dataset_hold_obj(dp, obj, FTAG,
&snap);
if (error != 0)
- return (error);
+ break;
if (snap->ds_dir != origin_head->ds_dir)
error = SET_ERROR(EINVAL);
if (error == 0) {
@@ -2020,7 +2020,11 @@ dmu_recv_end_check(void *arg, dmu_tx_t *
obj = dsl_dataset_phys(snap)->ds_prev_snap_obj;
dsl_dataset_rele(snap, FTAG);
if (error != 0)
- return (error);
+ break;
+ }
+ if (error != 0) {
+ dsl_dataset_rele(origin_head, FTAG);
+ return (error);
}
}
error = dsl_dataset_clone_swap_check_impl(drc->drc_ds,
More information about the svn-src-all
mailing list