From: Cong Ding <dinggnu@gmail.com>
To: Richard Mortimer <richm@oldelvet.org.uk>
Cc: Sam Ravnborg <sam@ravnborg.org>,
"David S. Miller" <davem@davemloft.net>,
sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3] sparc: kernel/sbus.c: fix memory leakage
Date: Thu, 17 Jan 2013 13:28:43 +0000 [thread overview]
Message-ID: <20130117132843.GD25615@gmail.com> (raw)
In-Reply-To: <50F7EED3.1050309@oldelvet.org.uk>
The variable iommu and strbuf are not freed properly if it goes to error.
Signed-off-by: Cong Ding <dinggnu@gmail.com>
---
arch/sparc/kernel/sbus.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c
index 1271b3a..be5bdf9 100644
--- a/arch/sparc/kernel/sbus.c
+++ b/arch/sparc/kernel/sbus.c
@@ -554,10 +554,8 @@ static void __init sbus_iommu_init(struct platform_device *op)
regs = pr->phys_addr;
iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC);
- if (!iommu)
- goto fatal_memory_error;
strbuf = kzalloc(sizeof(*strbuf), GFP_ATOMIC);
- if (!strbuf)
+ if (!iommu || !strbuf)
goto fatal_memory_error;
op->dev.archdata.iommu = iommu;
@@ -656,6 +654,8 @@ static void __init sbus_iommu_init(struct platform_device *op)
return;
fatal_memory_error:
+ kfree(iommu);
+ kfree(strbuf);
prom_printf("sbus_iommu_init: Fatal memory allocation error.\n");
}
--
1.7.4.5
next prev parent reply other threads:[~2013-01-17 13:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Cong Ding [this message]
2013-01-21 22:20 ` [PATCH v3] " Richard Mortimer
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=20130117132843.GD25615@gmail.com \
--to=dinggnu@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=richm@oldelvet.org.uk \
--cc=sam@ravnborg.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox