linux-kernel - Re: [PATCH 2.6.20-rc2] fs/jffs2/scan.c: Fix error-path leak

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20070102130709.0cd13b14.akpm@osdl.org>
Date:	Tue, 2 Jan 2007 13:07:09 -0800
From:	Andrew Morton <akpm@...l.org>
To:	Amit Choudhary <amit2030@...il.com>
Cc:	Linux Kernel <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 2.6.20-rc2] fs/jffs2/scan.c: Fix error-path leak

On Fri, 29 Dec 2006 03:32:02 -0800
Amit Choudhary <amit2030@...il.com> wrote:

> Description: Fix error-path leak in function jffs2_scan_medium(), in file fs/jffs2/scan.c
> 
> Signed-off-by: Amit Choudhary <amit2030@...il.com>
> 
> diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
> index e241346..cd9ed6e 100644
> --- a/fs/jffs2/scan.c
> +++ b/fs/jffs2/scan.c
> @@ -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.

--- a/fs/jffs2/scan.c~fs-jffs2-scanc-fix-error-path-leak
+++ a/fs/jffs2/scan.c
@@ -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;
 		}
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/