aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/module.h
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@sw.ru>2007-05-08 03:28:43 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:08 -0400
commit9d65cb4a1718a072898c7a57a3bc61b2dc4bcd4d (patch)
tree9e3fd1c9e61e8ed16959d115a9a3f6f7eb0bbf21 /include/linux/module.h
parentffb45122766db220d0bf3d01848d575fbbcb6430 (diff)
Fix race between cat /proc/*/wchan and rmmod et al
kallsyms_lookup() can go iterating over modules list unprotected which is OK for emergency situations (oops), but not OK for regular stuff like /proc/*/wchan. Introduce lookup_symbol_name()/lookup_module_symbol_name() which copy symbol name into caller-supplied buffer or return -ERANGE. All copying is done with module_mutex held, so... Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/module.h')
-rw-r--r--include/linux/module.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index 58d5a10cdf0d..099ae5932c68 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -454,6 +454,7 @@ const char *module_address_lookup(unsigned long addr,
454 unsigned long *symbolsize, 454 unsigned long *symbolsize,
455 unsigned long *offset, 455 unsigned long *offset,
456 char **modname); 456 char **modname);
457int lookup_module_symbol_name(unsigned long addr, char *symname);
457 458
458/* For extable.c to search modules' exception tables. */ 459/* For extable.c to search modules' exception tables. */
459const struct exception_table_entry *search_module_extables(unsigned long addr); 460const struct exception_table_entry *search_module_extables(unsigned long addr);
@@ -525,6 +526,11 @@ static inline const char *module_address_lookup(unsigned long addr,
525 return NULL; 526 return NULL;
526} 527}
527 528
529static inline int lookup_module_symbol_name(unsigned long addr, char *symname)
530{
531 return -ERANGE;
532}
533
528static inline int module_get_kallsym(unsigned int symnum, unsigned long *value, 534static inline int module_get_kallsym(unsigned int symnum, unsigned long *value,
529 char *type, char *name, 535 char *type, char *name,
530 char *module_name, int *exported) 536 char *module_name, int *exported)