All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cong Ding <dinggnu@gmail.com>
To: "David S. Miller" <davem@davemloft.net>,
	Cong Ding <dinggnu@gmail.com>,
	sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] sparc: kernel/sbus.c: fix memory leakage
Date: Mon, 14 Jan 2013 22:36:08 +0100	[thread overview]
Message-ID: <1358199372-11976-1-git-send-email-dinggnu@gmail.com> (raw)

the variable iommu and strbuf are not freed if it goes to error.

Signed-off-by: Cong Ding <dinggnu@gmail.com>
---
 arch/sparc/kernel/sbus.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c
index 1271b3a..0b66e53 100644
--- a/arch/sparc/kernel/sbus.c
+++ b/arch/sparc/kernel/sbus.c
@@ -555,10 +555,10 @@ static void __init sbus_iommu_init(struct platform_device *op)
 
 	iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC);
 	if (!iommu)
-		goto fatal_memory_error;
+		goto fatal_iommu_memory_error;
 	strbuf = kzalloc(sizeof(*strbuf), GFP_ATOMIC);
 	if (!strbuf)
-		goto fatal_memory_error;
+		goto fatal_strbuf_memory_error;
 
 	op->dev.archdata.iommu = iommu;
 	op->dev.archdata.stc = strbuf;
@@ -656,6 +656,10 @@ static void __init sbus_iommu_init(struct platform_device *op)
 	return;
 
 fatal_memory_error:
+	kfree(strbuf);
+fatal_strbuf_memory_error:
+	kfree(iommu);
+fatal_iommu_memory_error:
 	prom_printf("sbus_iommu_init: Fatal memory allocation error.\n");
 }
 
-- 
1.7.9.5


WARNING: multiple messages have this Message-ID (diff)
From: Cong Ding <dinggnu@gmail.com>
To: "David S. Miller" <davem@davemloft.net>,
	Cong Ding <dinggnu@gmail.com>,
	sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] sparc: kernel/sbus.c: fix memory leakage
Date: Mon, 14 Jan 2013 21:36:08 +0000	[thread overview]
Message-ID: <1358199372-11976-1-git-send-email-dinggnu@gmail.com> (raw)

the variable iommu and strbuf are not freed if it goes to error.

Signed-off-by: Cong Ding <dinggnu@gmail.com>
---
 arch/sparc/kernel/sbus.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c
index 1271b3a..0b66e53 100644
--- a/arch/sparc/kernel/sbus.c
+++ b/arch/sparc/kernel/sbus.c
@@ -555,10 +555,10 @@ static void __init sbus_iommu_init(struct platform_device *op)
 
 	iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC);
 	if (!iommu)
-		goto fatal_memory_error;
+		goto fatal_iommu_memory_error;
 	strbuf = kzalloc(sizeof(*strbuf), GFP_ATOMIC);
 	if (!strbuf)
-		goto fatal_memory_error;
+		goto fatal_strbuf_memory_error;
 
 	op->dev.archdata.iommu = iommu;
 	op->dev.archdata.stc = strbuf;
@@ -656,6 +656,10 @@ static void __init sbus_iommu_init(struct platform_device *op)
 	return;
 
 fatal_memory_error:
+	kfree(strbuf);
+fatal_strbuf_memory_error:
+	kfree(iommu);
+fatal_iommu_memory_error:
 	prom_printf("sbus_iommu_init: Fatal memory allocation error.\n");
 }
 
-- 
1.7.9.5


             reply	other threads:[~2013-01-14 21:36 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-14 21:36 Cong Ding [this message]
2013-01-14 21:36 ` [PATCH] sparc: kernel/sbus.c: fix memory leakage Cong Ding
2013-01-16 21:13 ` Sam Ravnborg
2013-01-16 21:13   ` Sam Ravnborg
2013-01-16 21:17   ` Cong Ding
2013-01-16 21:17     ` Cong Ding
2013-01-16 22:00     ` Sam Ravnborg
2013-01-16 22:00       ` Sam Ravnborg
2013-01-16 22:01       ` [PATCH v2] " Cong Ding
2013-01-16 22:01         ` Cong Ding
2013-01-17 10:41         ` Richard Mortimer
2013-01-17 11:56           ` Cong Ding
2013-01-17 12:30             ` Richard Mortimer
2013-01-17 13:16               ` Cong Ding
2013-01-17 13:28               ` [PATCH v3] " Cong Ding
2013-01-21 22:20                 ` Richard Mortimer
2013-01-21 22:34                   ` David Miller
2013-01-21 22:34                     ` David Miller

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=1358199372-11976-1-git-send-email-dinggnu@gmail.com \
    --to=dinggnu@gmail.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sparclinux@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.