summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 10:24:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 10:24:26 -0700
commit50edb5cc22c7b2ea7df095913596e5a649bd6b41 (patch)
tree7d17ab844b3e91dabc0ea862d7c94624e25e8bd6 /kernel
parentad3118b9861379e3a77883613369cb967ffac26a (diff)
parentd3051b489aa81ca9ba62af366149ef42b8dae97c (diff)
downloadlinux-50edb5cc22c7b2ea7df095913596e5a649bd6b41.tar.bz2
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module fix from Rusty Russell: "A single panic fix for a rare race, stable CC'd" * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: modules, lock around setting of MODULE_STATE_UNFORMED
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 65586ffa0c98..88cec1ddb1e3 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1842,7 +1842,9 @@ static void free_module(struct module *mod)
/* We leave it in list to prevent duplicate loads, but make sure
* that noone uses it while it's being deconstructed. */
+ mutex_lock(&module_mutex);
mod->state = MODULE_STATE_UNFORMED;
+ mutex_unlock(&module_mutex);
/* Remove dynamic debug info */
ddebug_remove_module(mod->name);