From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Stephen Hemminger <shemminger@vyatta.com>,
Jens Axboe <jens.axboe@oracle.com>,
David Teigland <teigland@redhat.com>,
Pekka Enberg <penberg@cs.helsinki.fi>,
"Hans J. Koch" <hjk@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v3] edd: fix possible memory leak in edd_init() error path
Date: Tue, 13 Jul 2010 13:02:38 +0800 [thread overview]
Message-ID: <1278997358.4112.2.camel@mola> (raw)
This version simply fix the coding style in v2. ( warnning by checkpatch.pl )
>From 7400dff50f7a6036839009d6990fd5c11f0654db Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 13 Jul 2010 12:56:19 +0800
Subject: [PATCH v3] edd: fix possible memory leak in edd_init() error path
The error may happen at any iteration of the for loop,
this patch properly unregisters already registed edd_devices in error path.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/firmware/edd.c | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 110e24e..f287fe7 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -744,7 +744,7 @@ static inline int edd_num_devices(void)
static int __init
edd_init(void)
{
- unsigned int i;
+ int i;
int rc=0;
struct edd_device *edev;
@@ -760,21 +760,27 @@ edd_init(void)
if (!edd_kset)
return -ENOMEM;
- for (i = 0; i < edd_num_devices() && !rc; i++) {
+ for (i = 0; i < edd_num_devices(); i++) {
edev = kzalloc(sizeof (*edev), GFP_KERNEL);
- if (!edev)
- return -ENOMEM;
+ if (!edev) {
+ rc = -ENOMEM;
+ goto out;
+ }
rc = edd_device_register(edev, i);
if (rc) {
kfree(edev);
- break;
+ goto out;
}
edd_devices[i] = edev;
}
- if (rc)
- kset_unregister(edd_kset);
+ return 0;
+
+out:
+ while (--i >= 0)
+ edd_device_unregister(edd_devices[i]);
+ kset_unregister(edd_kset);
return rc;
}
--
1.5.4.3
reply other threads:[~2010-07-13 5:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1278997358.4112.2.camel@mola \
--to=axel.lin@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=hjk@linutronix.de \
--cc=jens.axboe@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=penberg@cs.helsinki.fi \
--cc=shemminger@vyatta.com \
--cc=teigland@redhat.com \
/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