From: Kyle McMartin <kyle@parisc-linux.org>
Date: Wed, 30 May 2007 06:24:28 +0000 (-0400)
Subject: [PARISC] fix null ptr deref in unwind.c
X-Git-Tag: v2.6.22-rc5~36^2~5
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cb9577958d85896303561d9cc8544885deb272be;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 89c03707ecc..e70f57e2764 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);