Skip to contentSkip to conversation

fs/jffs2/scan.c: Fix error-path leak

PATCH Applied Amit Choudhary 2 participants 2 messages Dec 29, 2006 – Jan 2, 2007 Journalling flash file system V2 (JFFS2)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs/jffs2/scan.c: Fix error-path leak

Description: Fix error-path leak in function jffs2_scan_medium(), in file fs/jffs2/scan.c

fs/jffs2/scan.c +2 -0
index e241346..cd9ed6e 100644
@@ -130,6 +130,8 @@ #endif
 	if (jffs2_sum_active()) {
 		s = kmalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
 		if (!s) {
+			free(flashbuf);
+			flashbuf = NULL;
 			JFFS2_WARNING("Can't allocate memory for summary\n");
 			return -ENOMEM;
 		}
#1 lore raw
Quoted 9 lines · On Fri, 29 Dec 2006 03:32:02 -0800 Amit Choudhary <[email protected]> wrote:

Description: Fix error-path leak in function jffs2_scan_medium(), in file fs/jffs2/scan.c

fs/jffs2/scan.c +0 -0
index e241346..cd9ed6e 100644

fs/jffs2/scan.c #endif · line 137

Quoted 8 lines
fs/jffs2/scan.c +2 -0
@@ -130,6 +130,8 @@ #endif
 	if (jffs2_sum_active()) {
 		s = kmalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
 		if (!s) {
+			free(flashbuf);
+			flashbuf = NULL;
 			JFFS2_WARNING("Can't allocate memory for summary\n");
 			return -ENOMEM;
 		}

err, no.

I merged the below, thanks.

fs/jffs2/scan.c renamed from fs/jffs2/scan.c~fs-jffs2-scanc-fix-error-path-leak +1 -0
@@ -130,6 +130,7 @@ int jffs2_scan_medium(struct jffs2_sb_in
 	if (jffs2_sum_active()) {
 		s = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
 		if (!s) {
+			kfree(flashbuf);
 			JFFS2_WARNING("Can't allocate memory for summary\n");
 			return -ENOMEM;
 		}

_