Commit 92e2921f authored by Hou Tao's avatar Hou Tao Committed by Boris Brezillon
Browse files

jffs2: free jffs2_sb_info through jffs2_kill_sb() 



When an invalid mount option is passed to jffs2, jffs2_parse_options()
will fail and jffs2_sb_info will be freed, but then jffs2_sb_info will
be used (use-after-free) and freeed (double-free) in jffs2_kill_sb().

Fix it by removing the buggy invocation of kfree() when getting invalid
mount options.

Fixes: 92abc475 ("jffs2: implement mount option parsing and compression overriding")
Cc: stable@kernel.org
Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 299b4353

fs/jffs2/super.c

+1 −3
Original line number Diff line number Diff line
@@ -285,10 +285,8 @@ static int jffs2_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_fs_info = c;



	ret = jffs2_parse_options(c, data);

	if (ret) {

		kfree(c);

	if (ret)

		return -EINVAL;

	}



	/* Initialize JFFS2 superblock locks, the further initialization will

	 * be done later */