diff options
| author | Florin Malita <fmalita@gmail.com> | 2006-05-15 23:42:31 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-15 23:42:31 +0100 |
| commit | 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce (patch) | |
| tree | c2330fcf5e5c2e64d4b1bf3c7dce3ed19e164af1 /fs/jffs2 | |
| parent | 184f565210c6c8a852c53ffc070f9add61e0f331 (diff) | |
| download | linux-5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce.tar.bz2 | |
[PATCH] jffs2: memory leak in jffs2_scan_medium()
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>
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/scan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index cf55b221fc2b..eca0996def60 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c @@ -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 */ if (c->nextblock && (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 c->mtd->unpoint(c->mtd, flashbuf, 0, c->mtd->size); #endif + if (s) + kfree(s); + return ret; } |