summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-20 20:22:58 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-27 20:49:02 -0800
commita974118816871c9e5a1e7b837310ee1b84581c6d (patch)
tree87d0125788613e027c324ecd1e8a658d148d6c27
parentf9586ddba7b93ea72190f79c82079cbfc4bb8730 (diff)
module: fix missing module_mutex unlock
commit ee61abb3223e28a1a14a8429c0319755d20d3e40 upstream. Commit 1fb9341ac348 ("module: put modules in list much earlier") moved some of the module initialization code around, and in the process changed the exit paths too. But for the duplicate export symbol error case the change made the ddebug_cleanup path jump to after the module mutex unlock, even though it happens with the mutex held. Rusty has some patches to split this function up into some helper functions, hopefully the mess of complex goto targets will go away eventually. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 711d70d95c24..3e544f426296 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3100,8 +3100,8 @@ again:
/* module_bug_cleanup needs module_mutex protection */
mutex_lock(&module_mutex);
module_bug_cleanup(mod);
- mutex_unlock(&module_mutex);
ddebug_cleanup:
+ mutex_unlock(&module_mutex);
dynamic_debug_remove(info.debug);
synchronize_sched();
kfree(mod->args);