Skip to content

Commit

Permalink
JFFS2: memory leak in jffs2_do_mount_fs()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Adamushko authored and David Woodhouse committed Feb 9, 2007
1 parent 0d36da3 commit cfa7239
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions fs/jffs2/build.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit cfa7239

Please sign in to comment.