6873 zfs_destroy_snaps_nvl leaks errlist

cwill · ahrens · commit 4cde22c29999 · 2016-04-22T16:50:59.000-07:00
Reviewed by: Matthew Ahrens &lt;mahrens@delphix.com&gt;
Reviewed by: Paul Dagnelie &lt;pcd@delphix.com&gt;
Approved by: Dan McDonald &lt;danmcd@omniti.com&gt;
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c
@@ -3403,12 +3403,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];
@@ -3436,6 +3438,7 @@ zfs_destroy_snaps_nvl(libzfs_handle_t *hdl, nvlist_t *snaps, boolean_t defer)
 		}
 	}
 
+	nvlist_free(errlist);
 	return (ret);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3403,12 +3403,14 @@ int`
`3403`	`3403`	`zfs_destroy_snaps_nvl(libzfs_handle_t hdl, nvlist_t snaps, boolean_t defer)`
`3404`	`3404`	`{`
`3405`	`3405`	`int ret;`
`3406`		`- nvlist_t *errlist;`
	`3406`	`+ nvlist_t *errlist = NULL;`
`3407`	`3407`
`3408`	`3408`	`ret = lzc_destroy_snaps(snaps, defer, &errlist);`
`3409`	`3409`
`3410`		`- if (ret == 0)`
	`3410`	`+ if (ret == 0) {`
	`3411`	`+ nvlist_free(errlist);`
`3411`	`3412`	`return (0);`
	`3413`	`+ }`
`3412`	`3414`
`3413`	`3415`	`if (nvlist_empty(errlist)) {`
`3414`	`3416`	`char errbuf[1024];`
`@@ -3436,6 +3438,7 @@ zfs_destroy_snaps_nvl(libzfs_handle_t hdl, nvlist_t snaps, boolean_t defer)`
`3436`	`3438`	`}`
`3437`	`3439`	`}`
`3438`	`3440`
	`3441`	`+ nvlist_free(errlist);`
`3439`	`3442`	`return (ret);`
`3440`	`3443`	`}`
`3441`	`3444`