jffs2: potential memory leaks in jffs2_scan_medium()
PATCH 1/1 jffs2: potential memory leaks in jffs2_scan_medium()
This patch deals with 3 return paths that fail to perform proper cleanup (which can result into leaking 'flashbuf' and/or 's').
Coverity IDs: 676, 1301
Signed-off-by Florin Malita <[email protected]>
---
fs/jffs2/scan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/jffs2/scan.c +5 -5
@@ -128,12 +128,12 @@ #endif }if (jffs2_sum_active ()) { - s =kmalloc (sizeof (struct jffs2_summary ),GFP_KERNEL ); + s =kzalloc (sizeof (struct jffs2_summary ),GFP_KERNEL );if (!s) {JFFS2_WARNING ("Can't allocate memory for summary\n" ); -return -ENOMEM ; + ret = -ENOMEM ; + goto out; } -memset (s,0 ,sizeof (struct jffs2_summary )); }for (i=0 ; i<c->nr_blocks; i++) {
@@ -194,7 +194,7 @@ #endifif (c->nextblock) { ret =file_dirty (c, c->nextblock);if (ret) -return ret; + goto out;/* deleting summary information of the old nextblock */ jffs2_sum_reset_collected (c->summary); }
@@ -205,7 +205,7 @@ #endif }else { ret =file_dirty (c, jeb);if (ret) -return ret; + goto out; }break ;