diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-05 14:29:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-05 14:29:27 -0400 |
commit | 5336377d6225959624146629ce3fc88ee8ecda3d (patch) | |
tree | 571b9db75d1ba50faa1e399509563f367fd5694f /arch/powerpc | |
parent | 2f6b3aa7a563d05453c4d73ccf88191aee84333f (diff) |
modules: Fix module_bug_list list corruption race
With all the recent module loading cleanups, we've minimized the code
that sits under module_mutex, fixing various deadlocks and making it
possible to do most of the module loading in parallel.
However, that whole conversion totally missed the rather obscure code
that adds a new module to the list for BUG() handling. That code was
doubly obscure because (a) the code itself lives in lib/bugs.c (for
dubious reasons) and (b) it gets called from the architecture-specific
"module_finalize()" rather than from generic code.
Calling it from arch-specific code makes no sense what-so-ever to begin
with, and is now actively wrong since that code isn't protected by the
module loading lock any more.
So this commit moves the "module_bug_{finalize,cleanup}()" calls away
from the arch-specific code, and into the generic code - and in the
process protects it with the module_mutex so that the list operations
are now safe.
Future fixups:
- move the module list handling code into kernel/module.c where it
belongs.
- get rid of 'module_bug_list' and just use the regular list of modules
(called 'modules' - imagine that) that we already create and maintain
for other reasons.
Reported-and-tested-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Adrian Bunk <bunk@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/module.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c index 477c663e0140..4ef93ae2235f 100644 --- a/arch/powerpc/kernel/module.c +++ b/arch/powerpc/kernel/module.c | |||
@@ -65,10 +65,6 @@ int module_finalize(const Elf_Ehdr *hdr, | |||
65 | const Elf_Shdr *sect; | 65 | const Elf_Shdr *sect; |
66 | int err; | 66 | int err; |
67 | 67 | ||
68 | err = module_bug_finalize(hdr, sechdrs, me); | ||
69 | if (err) | ||
70 | return err; | ||
71 | |||
72 | /* Apply feature fixups */ | 68 | /* Apply feature fixups */ |
73 | sect = find_section(hdr, sechdrs, "__ftr_fixup"); | 69 | sect = find_section(hdr, sechdrs, "__ftr_fixup"); |
74 | if (sect != NULL) | 70 | if (sect != NULL) |
@@ -101,5 +97,4 @@ int module_finalize(const Elf_Ehdr *hdr, | |||
101 | 97 | ||
102 | void module_arch_cleanup(struct module *mod) | 98 | void module_arch_cleanup(struct module *mod) |
103 | { | 99 | { |
104 | module_bug_cleanup(mod); | ||
105 | } | 100 | } |