summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2015-09-04 22:03:43 -0600
committerTom Rini <trini@konsulko.com>2015-09-11 17:15:22 -0400
commit676505f5ce6c621d8c28958d600dcf92bcf76574 (patch)
tree1b5e0e4c4a6c4271b1ff0fb80125cf746226db88
parent44bfb43f9afab9b2944bb98bc0d514303f029ff9 (diff)
downloadtalos-obmc-uboot-676505f5ce6c621d8c28958d600dcf92bcf76574.tar.gz
talos-obmc-uboot-676505f5ce6c621d8c28958d600dcf92bcf76574.zip
ext4: avoid calling ext4fs_mount() twice, which leaks
ext4_write_file() is only called from the "fs" layer, which calls both ext4fs_mount() and ext4fs_close() before/after calling ext4_write_file(). Fix ext4_write_file() not to call ext4fs_mount() again, since the mount operation malloc()s some RAM which is leaked when a second mount call over-writes the pointer to that data, if no intervening close call is made. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Lukasz Majewski <l.majewski@samsung.com> Tested-by: Lukasz Majewski <l.majewski@samsung.com>
-rw-r--r--fs/ext4/ext4_write.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index d346c065cd..e027916763 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -987,26 +987,17 @@ int ext4_write_file(const char *filename, void *buf, loff_t offset,
return -1;
}
- /* mount the filesystem */
- if (!ext4fs_mount(0)) {
- printf("** Error Bad ext4 partition **\n");
- goto fail;
- }
-
ret = ext4fs_write(filename, buf, len);
-
if (ret) {
printf("** Error ext4fs_write() **\n");
goto fail;
}
- ext4fs_close();
*actwrite = len;
return 0;
fail:
- ext4fs_close();
*actwrite = 0;
return -1;
OpenPOWER on IntegriCloud