lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] jffs2: memory leak in jffs2_scan_medium()

Browse Source 
If jffs2_scan_eraseblock() fails and the exit path is taken, 's' is not
being deallocated.

Reported by Coverity, CID: 1258.

Signed-off-by: Florin Malita <fmalita@gmail.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
Florin Malita
2006-05-15 23:42:31 +01:00
committed by David Woodhouse
parent 184f565210
commit 5b5ffbc1e6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/jffs2/scan.c
View File

@@ -222,9 +222,6 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
} }
} }
if (jffs2_sum_active() && s)
kfree(s);
/* Nextblock dirty is always seen as wasted, because we cannot recycle it now */ /* Nextblock dirty is always seen as wasted, because we cannot recycle it now */
if (c->nextblock && (c->nextblock->dirty_size)) { if (c->nextblock && (c->nextblock->dirty_size)) {
c->nextblock->wasted_size += c->nextblock->dirty_size; c->nextblock->wasted_size += c->nextblock->dirty_size;
@@ -266,6 +263,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
else else
c->mtd->unpoint(c->mtd, flashbuf, 0, c->mtd->size); c->mtd->unpoint(c->mtd, flashbuf, 0, c->mtd->size);
#endif #endif
if (s)
kfree(s);
return ret; return ret;
} }