kernel-janitors.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 04/10] x86: mce: fix error handling
@ 2010-07-28 16:39 Kulikov Vasiliy
  2010-07-28 16:48 ` Borislav Petkov
  2010-07-28 17:07 ` Andi Kleen
  0 siblings, 2 replies; 11+ messages in thread
From: Kulikov Vasiliy @ 2010-07-28 16:39 UTC (permalink / raw)
  To: kernel-janitors
  Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, Hidetoshi Seto,
	Borislav Petkov, Andi Kleen, linux-kernel

mcheck_init_device() poorly handles errors. If any request fails
unregister and free everything.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
 arch/x86/kernel/cpu/mcheck/mce.c |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index ed41562..a1119f1 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2124,22 +2124,38 @@ static __init int mcheck_init_device(void)
 	if (!mce_available(&boot_cpu_data))
 		return -EIO;
 
-	zalloc_cpumask_var(&mce_dev_initialized, GFP_KERNEL);
+	if (!zalloc_cpumask_var(&mce_dev_initialized, GFP_KERNEL))
+		return -ENOMEM;
 
 	mce_init_banks();
 
 	err = sysdev_class_register(&mce_sysclass);
 	if (err)
-		return err;
+		goto err_free_cpumask_var;
 
 	for_each_online_cpu(i) {
 		err = mce_create_device(i);
 		if (err)
-			return err;
+			goto mce_remove_devices;
 	}
 
 	register_hotcpu_notifier(&mce_cpu_notifier);
-	misc_register(&mce_log_device);
+	err = misc_register(&mce_log_device);
+	if (err)
+		goto err_unreg_notifier;
+	return 0;
+
+err_unreg_notifier:
+	unregister_hotcpu_notifier(&mce_cpu_notifier);
+
+mce_remove_devices:
+	for_each_online_cpu(i)
+		mce_remove_device(i);
+
+	sysdev_class_unregister(&mce_sysclass);
+
+err_free_cpumask_var:
+	free_cpumask_var(mce_dev_initialized);
 
 	return err;
 }
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2010-07-31 19:07 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-28 16:39 [PATCH 04/10] x86: mce: fix error handling Kulikov Vasiliy
2010-07-28 16:48 ` Borislav Petkov
2010-07-28 17:07 ` Andi Kleen
2010-07-28 17:13   ` Vasiliy Kulikov
2010-07-28 17:20     ` Andi Kleen
2010-07-29  9:35       ` Vasiliy Kulikov
2010-07-29  9:51         ` Andi Kleen
2010-07-29 10:10           ` walter harms
2010-07-31 18:18             ` Vasiliy Kulikov
2010-07-31 19:07             ` Vasiliy Kulikov
2010-07-29 10:16           ` Borislav Petkov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).