lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

module: fix BUG_ON() for powerpc (and other function descriptor archs)

Browse Source 
The rarely-used symbol_put_addr() needs to use dereference_function_descriptor
on powerpc.

Reported-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rusty Russell
2009-08-26 22:02:54 +09:30
committed by Linus Torvalds
parent 0a80fb1023
commit 7d1d16e416
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/module.c
View File

@@ -909,16 +909,18 @@ void __symbol_put(const char *symbol)
} }
EXPORT_SYMBOL(__symbol_put); EXPORT_SYMBOL(__symbol_put);
/* Note this assumes addr is a function, which it currently always is. */
void symbol_put_addr(void *addr) void symbol_put_addr(void *addr)
{ {
struct module *modaddr; struct module *modaddr;
unsigned long a = (unsigned long)dereference_function_descriptor(addr);
if (core_kernel_text((unsigned long)addr)) if (core_kernel_text(a))
return; return;
/* module_text_address is safe here: we're supposed to have reference /* module_text_address is safe here: we're supposed to have reference
* to module from symbol_get, so it can't go away. */ * to module from symbol_get, so it can't go away. */
modaddr = __module_text_address((unsigned long)addr); modaddr = __module_text_address(a);
BUG_ON(!modaddr); BUG_ON(!modaddr);
module_put(modaddr); module_put(modaddr);
} }