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

[Andrew Morton]

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

> Description: Fix error-path leak in function jffs2_scan_medium(), in file fs/jffs2/scan.c
> 
> Signed-off-by: Amit Choudhary <amit2030@xxxxxxxxx>
> 
> 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/