diff options
| author | Dmitry Adamushko <dmitry.adamushko@gmail.com> | 2007-01-19 03:20:30 +0300 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-09 18:00:21 +0300 |
| commit | cfa72397cf3a15f2841447440fd53980b3ecd624 (patch) | |
| tree | d6e3dd264f523845e0c0fb05da377485c3bc40e6 | |
| parent | 0d36da3b409536a24266c5f0972f2e1cfae1afd4 (diff) | |
| download | linux-cfa72397cf3a15f2841447440fd53980b3ecd624.tar.xz | |
JFFS2: memory leak in jffs2_do_mount_fs()
If jffs2_sum_init() fails, c->blocks is not freed neither in
jffs2_do_mount_fs() nor in jffs2_do_fill_super().
Signed-off-by: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| -rw-r--r-- | fs/jffs2/build.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/fs/jffs2/build.c b/fs/jffs2/build.c index 02826967ab58..07119c42a861 100644 --- a/fs/jffs2/build.c +++ b/fs/jffs2/build.c @@ -348,23 +348,27 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c) ret = jffs2_sum_init(c); if (ret) - return ret; + goto out_free; if (jffs2_build_filesystem(c)) { dbg_fsbuild("build_fs failed\n"); jffs2_free_ino_caches(c); jffs2_free_raw_node_refs(c); -#ifndef __ECOS - if (jffs2_blocks_use_vmalloc(c)) - vfree(c->blocks); - else -#endif - kfree(c->blocks); - - return -EIO; + ret = -EIO; + goto out_free; } jffs2_calc_trigger_levels(c); return 0; + + out_free: +#ifndef __ECOS + if (jffs2_blocks_use_vmalloc(c)) + vfree(c->blocks); + else +#endif + kfree(c->blocks); + + return ret; } |