From: Johan Wessfeldt <johan.wessfeldt@gmail.com>
To: tglx@linutronix.de
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
Johan Wessfeldt <johan.wessfeldt@gmail.com>
Subject: [PATCH] x86: mce: Potential memory leaks when initializing mcheck devices
Date: Fri, 4 Mar 2011 19:31:56 +0100 [thread overview]
Message-ID: <1299263516-18858-1-git-send-email-johan.wessfeldt@gmail.com> (raw)
This patch makes sure cleanup is done properly when mcheck fails
initializing any of its resources.
Note!
It should be safe to call mce_remove_device on ANY of the cpus as
mce_remove_device checks if corresponding cpu was initialized
before removing its resources.
Please review.
Signed-off-by: Johan Wessfeldt <johan.wessfeldt@gmail.com>
---
arch/x86/kernel/cpu/mcheck/mce.c | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index d916183..273f2f6 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2136,15 +2136,26 @@ static __init int mcheck_init_device(void)
for_each_online_cpu(i) {
err = mce_create_device(i);
if (err)
- return err;
+ goto out_unreg;
}
register_hotcpu_notifier(&mce_cpu_notifier);
- misc_register(&mce_log_device);
+ err = misc_register(&mce_log_device);
+ if (err)
+ goto out_unreg_hotcpu;
+
+ return 0;
+
+out_unreg_hotcpu:
+ unregister_hotcpu_notifier(&mce_cpu_notifier);
+out_unreg:
+ for_each_online_cpu(i)
+ mce_remove_device(i);
+ sysdev_class_unregister(&mce_sysclass);
+ free_cpumask_var(mce_dev_initialized);
return err;
}
-
device_initcall(mcheck_init_device);
/*
--
1.7.2.3
next reply other threads:[~2011-03-04 18:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-04 18:31 Johan Wessfeldt [this message]
2011-03-07 6:56 ` Johan Wessfeldt
2011-03-07 10:36 ` [PATCH V2] " Johan Wessfeldt
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=1299263516-18858-1-git-send-email-johan.wessfeldt@gmail.com \
--to=johan.wessfeldt@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@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
all inboxes | Powered by JetHome®