Commit cfa72397 authored by Dmitry Adamushko's avatar Dmitry Adamushko Committed by David Woodhouse
Browse files

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: default avatarDmitry Adamushko <dmitry.adamushko@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 0d36da3b

fs/jffs2/build.c

+13 −9
Original line number Diff line number Diff line
@@ -348,12 +348,21 @@ 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);

		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);
@@ -361,10 +370,5 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c) 
#endif

		kfree(c->blocks);



		return -EIO;

	}



	jffs2_calc_trigger_levels(c);



	return 0;

	return ret;

}