From: Chen Gang <gang.chen@asianux.com>
To: Paul Gortmaker <paul.gortmaker@windriver.com>,
lig.fnst@cn.fujitsu.com, chuansheng.liu@intel.com,
Wang YanQing <udknight@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] kernel/smp.c: free related resources when failure occurs in hotplug_cfd()
Date: Mon, 08 Jul 2013 16:50:24 +0800 [thread overview]
Message-ID: <51DA7D50.8010209@asianux.com> (raw)
When failure occurs in hotplug_cfd(), need release related resources,
or will cause memory leak.
Also beautify the related code.
Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
kernel/smp.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/kernel/smp.c b/kernel/smp.c
index 02a885d..c264623 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -45,15 +45,20 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
switch (action) {
case CPU_UP_PREPARE:
case CPU_UP_PREPARE_FROZEN:
- if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL,
- cpu_to_node(cpu)))
+ if (!zalloc_cpumask_var_node(&cfd->cpumask,
+ GFP_KERNEL, cpu_to_node(cpu)))
return notifier_from_errno(-ENOMEM);
- if (!zalloc_cpumask_var_node(&cfd->cpumask_ipi, GFP_KERNEL,
- cpu_to_node(cpu)))
+
+ if (!zalloc_cpumask_var_node(&cfd->cpumask_ipi,
+ GFP_KERNEL, cpu_to_node(cpu))) {
+ free_cpumask_var(cfd->cpumask);
return notifier_from_errno(-ENOMEM);
+ }
+
cfd->csd = alloc_percpu(struct call_single_data);
if (!cfd->csd) {
free_cpumask_var(cfd->cpumask);
+ free_cpumask_var(cfd->cpumask_ipi);
return notifier_from_errno(-ENOMEM);
}
break;
--
1.7.7.6
next reply other threads:[~2013-07-08 8:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-08 8:50 Chen Gang [this message]
2013-07-08 14:26 ` [PATCH] kernel/smp.c: free related resources when failure occurs in hotplug_cfd() Paul Gortmaker
2013-07-09 0:25 ` Chen Gang F T
2013-07-09 0:28 ` Wang YanQing
2013-07-09 0:32 ` Chen Gang
2013-07-09 0:43 ` [PATCH v2] " Chen Gang
2013-07-09 0:46 ` Wang YanQing
2013-07-09 0:46 ` Chen Gang
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=51DA7D50.8010209@asianux.com \
--to=gang.chen@asianux.com \
--cc=akpm@linux-foundation.org \
--cc=chuansheng.liu@intel.com \
--cc=lig.fnst@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=udknight@gmail.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