diff options
| author | Hou Tao <houtao1@huawei.com> | 2018-10-06 12:09:35 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-02-11 20:53:34 +0300 |
| commit | 79a2b3ec9950e484432960e5286b8a72168ed395 (patch) | |
| tree | 83078c446798b00c44b8756c57c332ea84414038 /fs/jffs2/super.c | |
| parent | cbaacda9f34847757ec506da01ccd89bb8ad163e (diff) | |
| download | linux-79a2b3ec9950e484432960e5286b8a72168ed395.tar.xz | |
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")
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/jffs2/super.c')
| -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 10902f70883d..f3194e5147fd 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 */ |