From bab0ab3c0dd16492d14eff5b5b445c00eccdda1c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 27 Jan 2008 15:38:40 -0800 Subject: [PATCH] --- yaml --- r: 77928 b: refs/heads/master c: 6494a93d55fad586238cc1940e846c6d03e1aaf6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/module.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 03e9ae118805..ec39a908d745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0aa5bd52d0c49ca56d24584c646e6544ccbb3dc9 +refs/heads/master: 6494a93d55fad586238cc1940e846c6d03e1aaf6 diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c index af3f81a94745..f6a4e721fd49 100644 --- a/trunk/kernel/module.c +++ b/trunk/kernel/module.c @@ -1230,6 +1230,7 @@ void module_remove_modinfo_attrs(struct module *mod) int mod_sysfs_init(struct module *mod) { int err; + struct kobject *kobj; if (!module_sysfs_initialized) { printk(KERN_ERR "%s: module sysfs not initialized\n", @@ -1237,6 +1238,15 @@ int mod_sysfs_init(struct module *mod) err = -EINVAL; goto out; } + + kobj = kset_find_obj(module_kset, mod->name); + if (kobj) { + printk(KERN_ERR "%s: module is already loaded\n", mod->name); + kobject_put(kobj); + err = -EINVAL; + goto out; + } + mod->mkobj.mod = mod; memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));