d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r348537: 8601 memory leak in get_special_prop()

Browse Source 
illumos/illumos-gate@e19b450bec

Reviewed by: Serapheim Dimitropoulos <serapheim.dimitro@delphix.com>
Reviewed by: Sara Hartse <sara.hartse@delphix.com>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Author:     John Gallagher <john.gallagher@delphix.com>
This commit is contained in:
Alexander Motin 2019-06-03 17:29:57 +00:00
commit b3ed2d08e4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=348559
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c
View File

@ -14,7 +14,7 @@
*/
/*
* Copyright (c) 2016 by Delphix. All rights reserved.
* Copyright (c) 2016, 2017 by Delphix. All rights reserved.
*/
#include "lua.h"
@ -431,16 +431,21 @@ get_special_prop(lua_State *state, dsl_dataset_t *ds, const char *dsname,
case ZFS_PROP_INCONSISTENT:
numval = dsl_get_inconsistent(ds);
break;
case ZFS_PROP_RECEIVE_RESUME_TOKEN:
VERIFY3U(strlcpy(strval, get_receive_resume_stats_impl(ds),
ZAP_MAXVALUELEN), <, ZAP_MAXVALUELEN);
case ZFS_PROP_RECEIVE_RESUME_TOKEN: {
char *token = get_receive_resume_stats_impl(ds);
VERIFY3U(strlcpy(strval, token, ZAP_MAXVALUELEN), <,
ZAP_MAXVALUELEN);
strfree(token);
if (strcmp(strval, "") == 0) {
VERIFY3U(strlcpy(strval, get_child_receive_stats(ds),
ZAP_MAXVALUELEN), <, ZAP_MAXVALUELEN);
token = get_child_receive_stats(ds);
VERIFY3U(strlcpy(strval, token, ZAP_MAXVALUELEN), <,
ZAP_MAXVALUELEN);
strfree(token);
if (strcmp(strval, "") == 0)
error = ENOENT;
}
break;
}
case ZFS_PROP_VOLSIZE:
ASSERT(ds_type == ZFS_TYPE_VOLUME);
error = dmu_objset_from_ds(ds, &os);