aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2017-05-24 20:53:01 +0000
committerAndriy Gapon <avg@FreeBSD.org>2017-05-24 20:53:01 +0000
commit56443189705ef53fa45ff58ed44110b9408307a8 (patch)
treed836f1f16e23f2bfa11e31c566539789b2bb3b5d /cddl
parentc65389d3677068e64b8eefb438f814d75476b8fa (diff)
parent1e876f2a648ff4966582c665640d5aee2879ab77 (diff)
downloadsrc-56443189705ef53fa45ff58ed44110b9408307a8.tar.gz
src-56443189705ef53fa45ff58ed44110b9408307a8.zip
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
Notes
Notes: svn path=/head/; revision=318814
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c b/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
index 6693d789af4d..9e4e88296483 100644
--- a/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
+++ b/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
@@ -759,6 +759,8 @@ lzc_rollback(const char *fsname, char *snapnamebuf, int snapnamelen)
const char *snapname = fnvlist_lookup_string(result, "target");
(void) strlcpy(snapnamebuf, snapname, snapnamelen);
}
+ nvlist_free(result);
+
return (err);
}