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: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 13 insertions, 9 deletions

diff --git a/fs/jffs2/build.c b/fs/jffs2/build.c
index 02826967ab5..07119c42a86 100644
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
@@ -348,23 +348,27 @@ 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);
-#ifndef __ECOS
-                if (jffs2_blocks_use_vmalloc(c))
-                        vfree(c->blocks);
-                else
-#endif
-                        kfree(c->blocks);
-
-                return -EIO;
+                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);
+        else
+#endif
+                kfree(c->blocks);
+
+        return ret;
 }