diff mbox

[U-Boot,v1] ZFS: Clean up cppcheck warnings where relevant, leaked memory etc

Message ID 1415322515-86220-1-git-send-email-lundman@lundman.net
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Jorgen Lundman Nov. 7, 2014, 1:08 a.m. UTC 
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>
---
 fs/zfs/zfs.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Tom Rini Nov. 10, 2014, 9:28 p.m. UTC | #1 
On Fri, Nov 07, 2014 at 10:08:35AM +0900, Jorgen Lundman wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 818d3d9..fb2b3ee 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -736,7 +736,7 @@  zap_hash(uint64_t salt, const char *name)
 	uint64_t crc = salt;
 
 	if (table[128] == 0) {
-		uint64_t *ct;
+		uint64_t *ct = NULL;
 		int i, j;
 		for (i = 0; i < 256; i++) {
 			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");
+	free(zapbuf);
 	return ZFS_ERR_BAD_FS;
 }
 
@@ -1094,6 +1095,7 @@  zap_iterate(dnode_end_t *zap_dnode,
 		return ret;
 	}
 	printf("unknown ZAP type\n");
+	free(zapbuf);
 	return 0;
 }
 
@@ -1865,6 +1867,7 @@  zfs_mount(device_t dev)
 
 	ubbest = malloc(sizeof(*ubbest));
 	if (!ubbest) {
+		free(ub_array);
 		zfs_unmount(data);
 		return 0;
 	}
@@ -1953,6 +1956,7 @@  zfs_mount(device_t dev)
 	if (err) {
 		printf("couldn't zio_read object directory\n");
 		zfs_unmount(data);
+		free(osp);
 		free(ubbest);
 		return 0;
 	}
@@ -2052,6 +2056,9 @@  zfs_open(struct zfs_file *file, const char *fsfilename)
 
 		hdrsize = SA_HDR_SIZE(((sa_hdr_phys_t *) sahdrp));
 		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 {
 		file->size = zfs_to_cpu64(((znode_phys_t *) DN_BONUS(&data->dnode.dn))->zp_size, data->dnode.endian);
 	}