diff options
author | Alexey Dobriyan <adobriyan@sw.ru> | 2007-05-08 03:28:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:08 -0400 |
commit | 9d65cb4a1718a072898c7a57a3bc61b2dc4bcd4d (patch) | |
tree | 9e3fd1c9e61e8ed16959d115a9a3f6f7eb0bbf21 /include/linux/kallsyms.h | |
parent | ffb45122766db220d0bf3d01848d575fbbcb6430 (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/kallsyms.h')
-rw-r--r-- | include/linux/kallsyms.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index 3e3b92dabe3b..ae0117a95cfd 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h | |||
@@ -30,6 +30,8 @@ extern int sprint_symbol(char *buffer, unsigned long address); | |||
30 | /* Look up a kernel symbol and print it to the kernel messages. */ | 30 | /* Look up a kernel symbol and print it to the kernel messages. */ |
31 | extern void __print_symbol(const char *fmt, unsigned long address); | 31 | extern void __print_symbol(const char *fmt, unsigned long address); |
32 | 32 | ||
33 | int lookup_symbol_name(unsigned long addr, char *symname); | ||
34 | |||
33 | #else /* !CONFIG_KALLSYMS */ | 35 | #else /* !CONFIG_KALLSYMS */ |
34 | 36 | ||
35 | static inline unsigned long kallsyms_lookup_name(const char *name) | 37 | static inline unsigned long kallsyms_lookup_name(const char *name) |
@@ -58,6 +60,11 @@ static inline int sprint_symbol(char *buffer, unsigned long addr) | |||
58 | return 0; | 60 | return 0; |
59 | } | 61 | } |
60 | 62 | ||
63 | static inline int lookup_symbol_name(unsigned long addr, char *symname) | ||
64 | { | ||
65 | return -ERANGE; | ||
66 | } | ||
67 | |||
61 | /* Stupid that this does nothing, but I didn't create this mess. */ | 68 | /* Stupid that this does nothing, but I didn't create this mess. */ |
62 | #define __print_symbol(fmt, addr) | 69 | #define __print_symbol(fmt, addr) |
63 | #endif /*CONFIG_KALLSYMS*/ | 70 | #endif /*CONFIG_KALLSYMS*/ |