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.

Cc: sta...@kernel.org
Signed-off-by: Hou Tao <hout...@huawei.com>
---
 fs/jffs2/super.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 87bdf0f4cba1..902a7dd10e5c 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 */
-- 
2.16.2.dirty

Reply via email to