aboutsummaryrefslogtreecommitdiff
path: root/fs/jffs2/scan.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-05-21 01:28:05 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-21 01:28:05 +0100
commit3560160aa26ebced1944aaa2e7e436d2a1b1bf70 (patch)
treeee0bb33931cef644b1e5f6794e6bed833f33d42c /fs/jffs2/scan.c
parent6171586a7ae5198988774e8480631e8d15f65dfe (diff)
downloadlinux-linaro-3560160aa26ebced1944aaa2e7e436d2a1b1bf70.tar.gz
[JFFS2] Fix memory leak in scan code; improve comments.
If we had to allocate extra space for the summary node, we weren't correctly freeing it when jffs2_sum_scan_sumnode() returned nonzero -- which is both the success and the failure case. Only when it returned zero, which means fall through to the full scan, were we correctly freeing the buffer. Document the meaning of those return codes while we're at it. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2/scan.c')
-rw-r--r--fs/jffs2/scan.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index 06637050749..192b0bd2118 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -516,10 +516,15 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
if (sumptr) {
err = jffs2_sum_scan_sumnode(c, jeb, sumptr, sumlen, &pseudo_random);
- if (err)
- return err;
+
if (buf_size && sumlen > buf_size)
kfree(sumptr);
+ /* If it returns with a real error, bail.
+ If it returns positive, that's a block classification
+ (i.e. BLK_STATE_xxx) so return that too.
+ If it returns zero, fall through to full scan. */
+ if (err)
+ return err;
}
}