diff options
| author | Hou Tao <houtao1@huawei.com> | 2018-10-06 17:09:35 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-13 11:14:45 -0800 |
| commit | 0035cb9d7366487205aba8cc0a2c03dd9dd75742 (patch) | |
| tree | 1b1cbc2db7f7c236a10d65141ddcc5991dd1453c /fs/jffs2 | |
| parent | 0be4ef1290cfe370caf52e3dac2325cf7ee12007 (diff) | |
jffs2: free jffs2_sb_info through jffs2_kill_sb()
commit 92e2921f7eee63450a5f953f4b15dc6210219430 upstream.
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: 92abc475d8de ("jffs2: implement mount option parsing and compression overriding")
Cc: stable@kernel.org
Signed-off-by: Hou Tao <houtao1@huawei.com>
Reviewed-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/super.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 33e01de576d2..bc00cc385b77 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -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 */ |