From patchwork Mon Feb 4 21:47:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3.5.y.z, extended, stable] Patch "module: fix missing module_mutex unlock" has been added to staging queue Date: Mon, 04 Feb 2013 11:47:02 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 218092 Message-Id: <1360014422-4197-1-git-send-email-herton.krzesinski@canonical.com> To: Linus Torvalds Cc: kernel-team@lists.ubuntu.com, Rusty Russell , Dan Carpenter This is a note to let you know that I have just added a patch titled module: fix missing module_mutex unlock to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ >From fdef195a4cc81c8a96507d7cc07a2c66645c504a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 20 Jan 2013 20:22:58 -0800 Subject: [PATCH] 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 Cc: Rusty Russell Signed-off-by: Linus Torvalds Signed-off-by: Herton Ronaldo Krzesinski --- kernel/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.7.9.5 diff --git a/kernel/module.c b/kernel/module.c index 19716ac..2ad732d1 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3033,8 +3033,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);