c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix coverity defects: CID 147610, 147608, 147607

Browse Source 
coverity scan CID:147610, Type: Resource leak.
coverity scan CID:147608, Type: Resource leak.
coverity scan CID:147607, Type: Resource leak.

Reviewed-by: Richard Laager <rlaager@wiktel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: cao.xuewen <cao.xuewen@zte.com.cn>
Closes #5143
This commit is contained in:
cao 2016-09-30 03:11:44 +08:00 committed by Brian Behlendorf
parent c9d61adbf8
commit 9ec0403d6a
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/zfs/zfs_main.c
View File

@ -6700,9 +6700,10 @@ zfs_do_diff(int argc, char **argv)
if ((atp = strchr(copy, '@'))) if ((atp = strchr(copy, '@')))
*atp = '\0'; *atp = '\0';
if ((zhp = zfs_open(g_zfs, copy, ZFS_TYPE_FILESYSTEM)) == NULL) if ((zhp = zfs_open(g_zfs, copy, ZFS_TYPE_FILESYSTEM)) == NULL) {
free(copy);
return (1); return (1);
}
free(copy); free(copy);
/* /*

30
cmd/zpool/zpool_vdev.c
View File

@ -1445,6 +1445,7 @@ construct_spec(nvlist_t *props, int argc, char **argv)
nl2cache = 0; nl2cache = 0;
is_log = B_FALSE; is_log = B_FALSE;
seen_logs = B_FALSE; seen_logs = B_FALSE;
nvroot = NULL;
while (argc > 0) { while (argc > 0) {
nv = NULL; nv = NULL;
@ -1463,7 +1464,7 @@ construct_spec(nvlist_t *props, int argc, char **argv)
gettext("invalid vdev " gettext("invalid vdev "
"specification: 'spare' can be " "specification: 'spare' can be "
"specified only once\n")); "specified only once\n"));
return (NULL); goto spec_out;
} }
is_log = B_FALSE; is_log = B_FALSE;
} }
@ -1474,7 +1475,7 @@ construct_spec(nvlist_t *props, int argc, char **argv)
gettext("invalid vdev " gettext("invalid vdev "
"specification: 'log' can be " "specification: 'log' can be "
"specified only once\n")); "specified only once\n"));
return (NULL); goto spec_out;
} }
seen_logs = B_TRUE; seen_logs = B_TRUE;
is_log = B_TRUE; is_log = B_TRUE;
@ -1493,7 +1494,7 @@ construct_spec(nvlist_t *props, int argc, char **argv)
gettext("invalid vdev " gettext("invalid vdev "
"specification: 'cache' can be " "specification: 'cache' can be "
"specified only once\n")); "specified only once\n"));
return (NULL); goto spec_out;
} }
is_log = B_FALSE; is_log = B_FALSE;
} }
@ -1504,7 +1505,7 @@ construct_spec(nvlist_t *props, int argc, char **argv)
gettext("invalid vdev " gettext("invalid vdev "
"specification: unsupported 'log' " "specification: unsupported 'log' "
"device: %s\n"), type); "device: %s\n"), type);
return (NULL); goto spec_out;
} }
nlogs++; nlogs++;
} }
@ -1522,7 +1523,7 @@ construct_spec(nvlist_t *props, int argc, char **argv)
for (c = 0; c < children - 1; c++) for (c = 0; c < children - 1; c++)
nvlist_free(child[c]); nvlist_free(child[c]);
free(child); free(child);
return (NULL); goto spec_out;
} }
child[children - 1] = nv; child[children - 1] = nv;
@ -1535,7 +1536,7 @@ construct_spec(nvlist_t *props, int argc, char **argv)
for (c = 0; c < children; c++) for (c = 0; c < children; c++)
nvlist_free(child[c]); nvlist_free(child[c]);
free(child); free(child);
return (NULL); goto spec_out;
} }
if (children > maxdev) { if (children > maxdev) {
@ -1545,7 +1546,7 @@ construct_spec(nvlist_t *props, int argc, char **argv)
for (c = 0; c < children; c++) for (c = 0; c < children; c++)
nvlist_free(child[c]); nvlist_free(child[c]);
free(child); free(child);
return (NULL); goto spec_out;
} }
argc -= c; argc -= c;
@ -1586,7 +1587,8 @@ construct_spec(nvlist_t *props, int argc, char **argv)
*/ */
if ((nv = make_leaf_vdev(props, argv[0], if ((nv = make_leaf_vdev(props, argv[0],
is_log)) == NULL) is_log)) == NULL)
return (NULL); goto spec_out;
if (is_log) if (is_log)
nlogs++; nlogs++;
argc--; argc--;
@ -1604,13 +1606,13 @@ construct_spec(nvlist_t *props, int argc, char **argv)
(void) fprintf(stderr, gettext("invalid vdev " (void) fprintf(stderr, gettext("invalid vdev "
"specification: at least one toplevel vdev must be " "specification: at least one toplevel vdev must be "
"specified\n")); "specified\n"));
return (NULL); goto spec_out;
} }
if (seen_logs && nlogs == 0) { if (seen_logs && nlogs == 0) {
(void) fprintf(stderr, gettext("invalid vdev specification: " (void) fprintf(stderr, gettext("invalid vdev specification: "
"log requires at least 1 device\n")); "log requires at least 1 device\n"));
return (NULL); goto spec_out;
} }
/* /*
@ -1628,16 +1630,16 @@ construct_spec(nvlist_t *props, int argc, char **argv)
verify(nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_L2CACHE, verify(nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_L2CACHE,
l2cache, nl2cache) == 0); l2cache, nl2cache) == 0);
spec_out:
for (t = 0; t < toplevels; t++) for (t = 0; t < toplevels; t++)
nvlist_free(top[t]); nvlist_free(top[t]);
for (t = 0; t < nspares; t++) for (t = 0; t < nspares; t++)
nvlist_free(spares[t]); nvlist_free(spares[t]);
for (t = 0; t < nl2cache; t++) for (t = 0; t < nl2cache; t++)
nvlist_free(l2cache[t]); nvlist_free(l2cache[t]);
if (spares)
free(spares); free(spares);
if (l2cache) free(l2cache);
free(l2cache);
free(top); free(top);
return (nvroot); return (nvroot);