From owner-svn-src-all@freebsd.org  Wed May 24 20:53:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8A9AD7C085;
 Wed, 24 May 2017 20:53:02 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B8F2910D0;
 Wed, 24 May 2017 20:53:02 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4OKr1jt014753;
 Wed, 24 May 2017 20:53:01 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4OKr1hK014752;
 Wed, 24 May 2017 20:53:01 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201705242053.v4OKr1hK014752@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 24 May 2017 20:53:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318814 -
 head/cddl/contrib/opensolaris/lib/libzfs_core/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 May 2017 20:53:03 -0000

Author: avg
Date: Wed May 24 20:53:01 2017
New Revision: 318814
URL: https://svnweb.freebsd.org/changeset/base/318814

Log:
  MFC r316904: 7729 libzfs_core`lzc_rollback() leaks result nvl
  
  illumos/illumos-gate@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@delphix.com>
  Reviewed by: Prakash Surya <prakash.surya@delphix.com>
  Approved by: Dan McDonald <danmcd@omniti.com>
  Author: Yuri Pankov <yuri.pankov@nexenta.com>
  
  MFC after:	2 weeks

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

Modified: head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Wed May 24 20:52:47 2017	(r318813)
+++ head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Wed May 24 20:53:01 2017	(r318814)
@@ -759,6 +759,8 @@ lzc_rollback(const char *fsname, char *s
 		const char *snapname = fnvlist_lookup_string(result, "target");
 		(void) strlcpy(snapnamebuf, snapname, snapnamelen);
 	}
+	nvlist_free(result);
+
 	return (err);
 }