public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@osdl.org>
To: Amit Choudhary <amit2030@gmail.com>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2.6.20-rc2] fs/jffs2/scan.c: Fix error-path leak
Date: Tue, 2 Jan 2007 13:07:09 -0800	[thread overview]
Message-ID: <20070102130709.0cd13b14.akpm@osdl.org> (raw)
In-Reply-To: <20061229033202.5f008efc.amit2030@gmail.com>

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

> Description: Fix error-path leak in function jffs2_scan_medium(), in file fs/jffs2/scan.c
> 
> Signed-off-by: Amit Choudhary <amit2030@gmail.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;
 		}
_


      reply	other threads:[~2007-01-02 21:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-29 11:32 [PATCH 2.6.20-rc2] fs/jffs2/scan.c: Fix error-path leak Amit Choudhary
2007-01-02 21:07 ` Andrew Morton [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070102130709.0cd13b14.akpm@osdl.org \
    --to=akpm@osdl.org \
    --cc=amit2030@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox