diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-10-28 13:17:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-28 13:17:20 +0100 |
| commit | e4340bbb07dd38339c0773543dd928886e512a57 (patch) | |
| tree | f38d9d2f929037325362328415b2a1e7bfe52a15 /kernel/module.c | |
| parent | Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu (diff) | |
| parent | block: re-add discard_granularity and alignment checks (diff) | |
| download | linux-rng-e4340bbb07dd38339c0773543dd928886e512a57.tar.xz linux-rng-e4340bbb07dd38339c0773543dd928886e512a57.zip | |
Merge branch 'linus' into core/rcu, to fix up a semantic conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index b86b7bf1be38..8f051a106676 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1063,11 +1063,15 @@ void symbol_put_addr(void *addr) if (core_kernel_text(a)) return; - /* module_text_address is safe here: we're supposed to have reference - * to module from symbol_get, so it can't go away. */ + /* + * Even though we hold a reference on the module; we still need to + * disable preemption in order to safely traverse the data structure. + */ + preempt_disable(); modaddr = __module_text_address(a); BUG_ON(!modaddr); module_put(modaddr); + preempt_enable(); } EXPORT_SYMBOL_GPL(symbol_put_addr); |