aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2007-05-30 02:43:16 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-30 10:51:38 -0700
commit7a74fc4925067c2102175baef73f9b07ab519b71 (patch)
tree652b0a4cd513ff7ce126e452b21ec7233f26bc4d /kernel
parentb927b3e2c9bc39b7eeeaca91e4cd6c3ed59f165a (diff)
downloadkernel_samsung_crespo-7a74fc4925067c2102175baef73f9b07ab519b71.zip
kernel_samsung_crespo-7a74fc4925067c2102175baef73f9b07ab519b71.tar.gz
kernel_samsung_crespo-7a74fc4925067c2102175baef73f9b07ab519b71.tar.bz2
fix possible null ptr deref in kallsyms_lookup
ugh, this function gets called by our unwinder. recursive backtrace for the win... bisection to find this one was "fun." Signed-off-by: Kyle McMartin <kyle@parisc-linux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kallsyms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index f1bda23..fed5441 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -257,7 +257,8 @@ const char *kallsyms_lookup(unsigned long addr,
pos = get_symbol_pos(addr, symbolsize, offset);
/* Grab name */
kallsyms_expand_symbol(get_symbol_offset(pos), namebuf);
- *modname = NULL;
+ if (modname)
+ *modname = NULL;
return namebuf;
}