Illumos 5427 - memory leak in libzfs when doing rollback

5427 memory leak in libzfs when doing rollback
Reviewed by: Michael Tsymbalyuk <mtzaurus@gmail.com>
Reviewed by: Steven Hartland <killing@multiplay.co.uk>
Approved by: Dan McDonald <danmcd@omniti.com>

References
  https://github.com/illumos/illumos-gate/commit/b7070b7
  https://www.illumos.org/issues/5427

Ported-by: kernelOfTruth kerneloftruth@gmail.com
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3569

diff --git a/lib/libzfs/libzfs_iter.c b/lib/libzfs/libzfs_iter.c
index e5140f2e17b405bc4568632478febec51d3bb7ed..5c1cf966a543fc52f64538db1f9f6bbae21084bb 100644 (file)
--- a/lib/libzfs/libzfs_iter.c
+++ b/lib/libzfs/libzfs_iter.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
- * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #include <stdio.h>
@@ -192,9 +192,6 @@ zfs_iter_bookmarks(zfs_handle_t *zhp, zfs_iter_f func, void *data)
        fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATETXG));
        fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATION));
 
-       /* Allocate an nvlist to hold the bookmarks. */
-       bmarks = fnvlist_alloc();
-
        if ((err = lzc_get_bookmarks(zhp->zfs_name, props, &bmarks)) != 0)
                goto out;