public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] sparc: kernel/sbus.c: fix memory leakage
@ 2013-01-14 21:36 Cong Ding
  2013-01-16 21:13 ` Sam Ravnborg
  0 siblings, 1 reply; 12+ messages in thread
From: Cong Ding @ 2013-01-14 21:36 UTC (permalink / raw)
  To: David S. Miller, Cong Ding, sparclinux, linux-kernel

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


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-01-21 22:34 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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:17   ` Cong Ding
2013-01-16 22:00     ` Sam Ravnborg
2013-01-16 22:01       ` [PATCH v2] " 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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox