* [PATCH 2.6.20-rc2] fs/jffs2/scan.c: Fix error-path leak
@ 2006-12-29 11:32 Amit Choudhary
2007-01-02 21:07 ` Andrew Morton
0 siblings, 1 reply; 2+ messages in thread
From: Amit Choudhary @ 2006-12-29 11:32 UTC (permalink / raw)
To: Linux Kernel
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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2.6.20-rc2] fs/jffs2/scan.c: Fix error-path leak
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
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2007-01-02 21:07 UTC (permalink / raw)
To: Amit Choudhary; +Cc: Linux Kernel
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;
}
_
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-01-02 21:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox