c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-30 14:08:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix coverity defects: CID 150953, 147603, 147610

Browse Source 
coverity scan CID:150953,type: uninitialized scalar variable
coverity scan CID:147603,type: Resource leak
coverity scan CID:147610,type: Resource leak

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: luozhengzheng <luo.zhengzheng@zte.com.cn>
Closes #5209
This commit is contained in:
luozhengzheng 2016-10-05 09:15:57 +08:00 committed by Brian Behlendorf
parent 5cc78dc812
commit e2c292bbfc
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/zfs/zfs_main.c
View File

@ -6120,8 +6120,11 @@ share_mount(int op, int argc, char **argv)
start_progress_timer(); start_progress_timer();
get_all_datasets(&dslist, &count, verbose); get_all_datasets(&dslist, &count, verbose);
if (count == 0) if (count == 0) {
if (options != NULL)
free(options);
return (0); return (0);
}
qsort(dslist, count, sizeof (void *), libzfs_dataset_cmp); qsort(dslist, count, sizeof (void *), libzfs_dataset_cmp);
@ -6153,8 +6156,11 @@ share_mount(int op, int argc, char **argv)
*/ */
/* Reopen MNTTAB to prevent reading stale data from open file */ /* Reopen MNTTAB to prevent reading stale data from open file */
if (freopen(MNTTAB, "r", mnttab_file) == NULL) if (freopen(MNTTAB, "r", mnttab_file) == NULL) {
if (options != NULL)
free(options);
return (ENOENT); return (ENOENT);
}
while (getmntent(mnttab_file, &entry) == 0) { while (getmntent(mnttab_file, &entry) == 0) {
if (strcmp(entry.mnt_fstype, MNTTYPE_ZFS) != 0 || if (strcmp(entry.mnt_fstype, MNTTYPE_ZFS) != 0 ||
@ -6184,6 +6190,9 @@ share_mount(int op, int argc, char **argv)
} }
} }
if (options != NULL)
free(options);
return (ret); return (ret);
} }

6
lib/libzpool/kernel.c
View File

@ -599,8 +599,8 @@ cv_broadcast(kcondvar_t *cv)
int int
vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3) vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
{ {
int fd; int fd = -1;
int dump_fd; int dump_fd = -1;
vnode_t *vp; vnode_t *vp;
int old_umask = 0; int old_umask = 0;
char *realpath; char *realpath;
@ -698,6 +698,8 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
if (fstat64_blk(fd, &st) == -1) { if (fstat64_blk(fd, &st) == -1) {
err = errno; err = errno;
close(fd); close(fd);
if (dump_fd != -1)
close(dump_fd);
return (err); return (err);
} }

2
module/icp/io/aes.c
View File

@ -1282,7 +1282,7 @@ aes_common_init_ctx(aes_ctx_t *aes_ctx, crypto_spi_ctx_template_t *template,
{ {
int rv = CRYPTO_SUCCESS; int rv = CRYPTO_SUCCESS;
void *keysched; void *keysched;
size_t size; size_t size = 0;
if (template == NULL) { if (template == NULL) {
if ((keysched = aes_alloc_keysched(&size, kmflag)) == NULL) if ((keysched = aes_alloc_keysched(&size, kmflag)) == NULL)