[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1358199372-11976-1-git-send-email-dinggnu@gmail.com>
Date: Mon, 14 Jan 2013 22:36:08 +0100
From: Cong Ding <dinggnu@...il.com>
To: "David S. Miller" <davem@...emloft.net>,
Cong Ding <dinggnu@...il.com>, sparclinux@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] sparc: kernel/sbus.c: fix memory leakage
the variable iommu and strbuf are not freed if it goes to error.
Signed-off-by: Cong Ding <dinggnu@...il.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists