[rtems commit] jffs2: Fix memory leak in jffs2_scan_eraseblock() error path

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    e1a5720264babaadabdbe956310acd845f2100e1
Changeset: http://git.rtems.org/rtems/commit/?id=e1a5720264babaadabdbe956310acd845f2100e1

Author:    Wenwen Wang <wenwen at cs.uga.edu>
Date:      Mon Aug 19 16:55:04 2019 -0500

jffs2: Fix memory leak in jffs2_scan_eraseblock() error path

In jffs2_scan_eraseblock(), 'sumptr' is allocated through kmalloc() if
'sumlen' is larger than 'buf_size'. However, it is not deallocated in the
following execution if jffs2_fill_scan_buf() fails, leading to a memory
leak bug. To fix this issue, free 'sumptr' before returning the error.

Signed-off-by: Wenwen Wang <wenwen at cs.uga.edu>
Signed-off-by: Richard Weinberger <richard at nod.at>

---

 cpukit/libfs/src/jffs2/src/scan.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cpukit/libfs/src/jffs2/src/scan.c b/cpukit/libfs/src/jffs2/src/scan.c
index 177a0cdd3f..d5441448b0 100644
--- a/cpukit/libfs/src/jffs2/src/scan.c
+++ b/cpukit/libfs/src/jffs2/src/scan.c
@@ -530,8 +530,11 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
 					err = jffs2_fill_scan_buf(c, sumptr, 
 								  jeb->offset + c->sector_size - sumlen,
 								  sumlen - buf_len);				
-					if (err)
+					if (err) {
+						if (sumlen > buf_size)
+							kfree(sumptr);
 						return err;
+					}
 				}
 			}