svn commit: r321544 - stable/11/cddl/contrib/opensolaris/lib/libzfs_core/common

Alexander Motin mav at FreeBSD.org
Wed Jul 26 16:30:59 UTC 2017


Author: mav
Date: Wed Jul 26 16:30:57 2017
New Revision: 321544
URL: https://svnweb.freebsd.org/changeset/base/321544

Log:
  MFC r318814: MFC r316904: 7729 libzfs_core`lzc_rollback() leaks result nvl
  
  illumos/illumos-gate at ac428481f96be89add7a1edf43ae47dd71038553
  https://github.com/illumos/illumos-gate/commit/ac428481f96be89add7a1edf43ae47dd71038553
  
  https://www.illumos.org/issues/7729
    libzfs_core`lzc_rollback() doesn't free the result nvl after lzc_ioctl() call.
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Prakash Surya <prakash.surya at delphix.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Yuri Pankov <yuri.pankov at nexenta.com>

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

Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Wed Jul 26 16:30:09 2017	(r321543)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Wed Jul 26 16:30:57 2017	(r321544)
@@ -759,6 +759,8 @@ lzc_rollback(const char *fsname, char *snapnamebuf, in
 		const char *snapname = fnvlist_lookup_string(result, "target");
 		(void) strlcpy(snapnamebuf, snapname, snapnamelen);
 	}
+	nvlist_free(result);
+
 	return (err);
 }
 


More information about the svn-src-stable-11 mailing list