summaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2007-05-30 02:24:28 -0400
committerKyle McMartin <kyle@minerva.i.cabal.ca>2007-05-30 02:24:28 -0400
commitcb9577958d85896303561d9cc8544885deb272be (patch)
treea8232600edf17cf4020a121ef4bb7735257e0f0e /arch/parisc
parent516a9491151d5f75911647dd44812f25ff24282d (diff)
downloadlinux-stable-cb9577958d85896303561d9cc8544885deb272be.tar.gz
linux-stable-cb9577958d85896303561d9cc8544885deb272be.tar.bz2
linux-stable-cb9577958d85896303561d9cc8544885deb272be.zip
[PARISC] fix null ptr deref in unwind.c
commit ffb45122766db220d0bf3d01848d575fbbcb6430 removed one too many args. kallsyms_lookup is not safe to call with a NULL *modname. Paper bag over the problem for the time being. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/kernel/unwind.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 89c03707eccc..e70f57e27643 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -216,8 +216,10 @@ static void unwind_frame_regs(struct unwind_frame_info *info)
/* Handle some frequent special cases.... */
{
char symname[KSYM_NAME_LEN+1];
+ char *modname;
- kallsyms_lookup(info->ip, NULL, NULL, NULL, symname);
+ kallsyms_lookup(info->ip, NULL, NULL, &modname,
+ symname);
dbg("info->ip = 0x%lx, name = %s\n", info->ip, symname);