lkml.org 
[lkml]   [2010]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[067/129] oprofile, x86: fix init_sysfs error handling
2.6.35-stable review patch.  If anyone has any objections, please let us know.

------------------
From: Robert Richter <robert.richter@amd.com>

commit 10f0412f57f2a76a90eff4376f59cbb0a39e4e18 upstream.

On failure init_sysfs() might not properly free resources. The error
code of the function is not checked. And, when reinitializing the exit
function might be called twice. This patch fixes all this.

Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
arch/x86/oprofile/nmi_int.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -568,8 +568,13 @@ static int __init init_sysfs(void)
int error;

error = sysdev_class_register(&oprofile_sysclass);
- if (!error)
- error = sysdev_register(&device_oprofile);
+ if (error)
+ return error;
+
+ error = sysdev_register(&device_oprofile);
+ if (error)
+ sysdev_class_unregister(&oprofile_sysclass);
+
return error;
}

@@ -695,6 +700,8 @@ int __init op_nmi_init(struct oprofile_o
char *cpu_type = NULL;
int ret = 0;

+ using_nmi = 0;
+
if (!cpu_has_apic)
return -ENODEV;

@@ -774,7 +781,10 @@ int __init op_nmi_init(struct oprofile_o

mux_init(ops);

- init_sysfs();
+ ret = init_sysfs();
+ if (ret)
+ return ret;
+
using_nmi = 1;
printk(KERN_INFO "oprofile: using NMI interrupt.\n");
return 0;



\
 
 \ /
  Last update: 2010-09-18 21:31    [W:0.301 / U:1.084 seconds]
©2003-2014 Jasper Spaans. Advertise on this site