svn commit: r307105 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Wed Oct 12 05:10:48 2016
New Revision: 307105
URL: https://svnweb.freebsd.org/changeset/base/307105

Log:
  MFC r305203: MFV r302655: 6873 zfs_destroy_snaps_nvl leaks errlist
  
  illumos/illumos-gate at 4cde22c29999ffb907ca39d2ebd512812f7e5168
  https://github.com/illumos/illumos-gate/commit/4cde22c29999ffb907ca39d2ebd512812
  f7e5168
  
  https://www.illumos.org/issues/6873
    lzc_destroy_snaps() returns an nvlist in errlist.
    zfs_destroy_snaps_nvl() should nvlist_free() it before returning.
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Paul Dagnelie <pcd at delphix.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Chris Williamson <chris.williamson at delphix.com>

Modified:
  stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Wed Oct 12 05:10:05 2016	(r307104)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Wed Oct 12 05:10:48 2016	(r307105)
@@ -3455,12 +3455,14 @@ int
 zfs_destroy_snaps_nvl(libzfs_handle_t *hdl, nvlist_t *snaps, boolean_t defer)
 {
 	int ret;
-	nvlist_t *errlist;
+	nvlist_t *errlist = NULL;
 
 	ret = lzc_destroy_snaps(snaps, defer, &errlist);
 
-	if (ret == 0)
+	if (ret == 0) {
+		nvlist_free(errlist);
 		return (0);
+	}
 
 	if (nvlist_empty(errlist)) {
 		char errbuf[1024];
@@ -3488,6 +3490,7 @@ zfs_destroy_snaps_nvl(libzfs_handle_t *h
 		}
 	}
 
+	nvlist_free(errlist);
 	return (ret);
 }