dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

ZFS: Clean up cppcheck warnings where relevant, leaked memory etc

Browse Source 
In a message from Wolfgang Denk highlighting warnings from cppcheck,
the patch will address those that are correctly diagnosed. Some are
false-positives:

> [fs/zfs/zfs.c:937]: (error) Memory leak: l
dmu_read() allocates "l" if successful, so error-case should not free
it.
> [fs/zfs/zfs.c:1141]: (error) Memory leak: dnbuf
dmu_read() allocates "dnbuf" if successful, so error-case should not
free it.
> [fs/zfs/zfs.c:1372]: (error) Memory leak: osp
zio_read() allocates "osp" if successful, so error-case should
not free it.
> [fs/zfs/zfs.c:1726]: (error) Memory leak: nvlist
int_zfs_fetch_nvlist() allocates "nvlist" if successful, so error-case
should not free it.

Signed-off-by: Jorgen Lundman <lundman@lundman.net>
This commit is contained in:
Jorgen Lundman
2014-11-07 10:08:35 +09:00
committed by Tom Rini
parent 6c5f4aef02
commit e183de0d3e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/zfs/zfs.c
View File

@@ -736,7 +736,7 @@ zap_hash(uint64_t salt, const char *name)
uint64_t crc = salt; uint64_t crc = salt;
if (table[128] == 0) { if (table[128] == 0) {
uint64_t *ct; uint64_t *ct = NULL;
int i, j; int i, j;
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
for (ct = table + i, *ct = i, j = 8; j > 0; j--) for (ct = table + i, *ct = i, j = 8; j > 0; j--)
@@ -1060,6 +1060,7 @@ zap_lookup(dnode_end_t *zap_dnode, char *name, uint64_t *val,
} }
printf("unknown ZAP type\n"); printf("unknown ZAP type\n");
free(zapbuf);
return ZFS_ERR_BAD_FS; return ZFS_ERR_BAD_FS;
} }
@@ -1094,6 +1095,7 @@ zap_iterate(dnode_end_t *zap_dnode,
return ret; return ret;
} }
printf("unknown ZAP type\n"); printf("unknown ZAP type\n");
free(zapbuf);
return 0; return 0;
} }
@@ -1865,6 +1867,7 @@ zfs_mount(device_t dev)
ubbest = malloc(sizeof(*ubbest)); ubbest = malloc(sizeof(*ubbest));
if (!ubbest) { if (!ubbest) {
free(ub_array);
zfs_unmount(data); zfs_unmount(data);
return 0; return 0;
} }
@@ -1953,6 +1956,7 @@ zfs_mount(device_t dev)
if (err) { if (err) {
printf("couldn't zio_read object directory\n"); printf("couldn't zio_read object directory\n");
zfs_unmount(data); zfs_unmount(data);
free(osp);
free(ubbest); free(ubbest);
return 0; return 0;
} }
@@ -2052,6 +2056,9 @@ zfs_open(struct zfs_file *file, const char *fsfilename)
hdrsize = SA_HDR_SIZE(((sa_hdr_phys_t *) sahdrp)); hdrsize = SA_HDR_SIZE(((sa_hdr_phys_t *) sahdrp));
file->size = *(uint64_t *) ((char *) sahdrp + hdrsize + SA_SIZE_OFFSET); file->size = *(uint64_t *) ((char *) sahdrp + hdrsize + SA_SIZE_OFFSET);
if ((data->dnode.dn.dn_bonuslen == 0) &&
(data->dnode.dn.dn_flags & DNODE_FLAG_SPILL_BLKPTR))
free(sahdrp);
} else { } else {
file->size = zfs_to_cpu64(((znode_phys_t *) DN_BONUS(&data->dnode.dn))->zp_size, data->dnode.endian); file->size = zfs_to_cpu64(((znode_phys_t *) DN_BONUS(&data->dnode.dn))->zp_size, data->dnode.endian);
} }