aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2007-10-17 02:30:27 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:01 -0400
commitd58ae67813ff97030d2f47ff7d1e5f54e5d7c5b3 (patch)
tree41d8e470d578636a0e5aeaed2d1e959e0c1a99c7
parent22d2b35b200f76085c16a2e14ca30b58510fcbe7 (diff)
module: return error when mod_sysfs_init() failed
load_module() returns zero when mod_sysfs_init() fails, then the module loading will succeed accidentally. This patch makes load_module() return error correctly in that case. Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/module.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c
index c24c3c35405a..a389b423c279 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1881,7 +1881,8 @@ static struct module *load_module(void __user *umod,
1881 module_unload_init(mod); 1881 module_unload_init(mod);
1882 1882
1883 /* Initialize kobject, so we can reference it. */ 1883 /* Initialize kobject, so we can reference it. */
1884 if (mod_sysfs_init(mod) != 0) 1884 err = mod_sysfs_init(mod);
1885 if (err)
1885 goto cleanup; 1886 goto cleanup;
1886 1887
1887 /* Set up license info based on the info section */ 1888 /* Set up license info based on the info section */