summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-06-23 02:34:19 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-06-23 02:34:19 +0200
commit4839641333d4593bfc4fb29aa3af10d36f607d5b (patch)
treebe86723c19390359019968f810158336b2cfd632 /fs
parentMerge git://git.infradead.org/mtd-2.6 (diff)
downloadlinux-4839641333d4593bfc4fb29aa3af10d36f607d5b.tar.xz
linux-4839641333d4593bfc4fb29aa3af10d36f607d5b.zip
jffs2: fix another potential leak on error path in scan.c
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/jffs2/scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index 7515e73e2bfb..696686cc206e 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -130,9 +130,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
if (jffs2_sum_active()) {
s = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
if (!s) {
- kfree(flashbuf);
JFFS2_WARNING("Can't allocate memory for summary\n");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto out;
}
}