Skip to contentSkip to conversation

x86: fix kernel panic on 32 bits when profiling

tip:x86/urgent Shi, Alex 1 participant 1 message Oct 13, 2009 1 message not in the archive x86

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Shi, Alex

author
#1 lore raw

Yes, it seems better than mine.

BRG
Alex

-----Original Message-----
From: tip tree robot [mailto:[email protected]] On Behalf Of tip-bot for H. Peter Anvin
Sent: 2009年10月13日 2:58
To: [email protected]
Cc: Chen, Tim C; [email protected]; [email protected]; [email protected]; Shi, Alex; [email protected]; [email protected]
Subject: [tip:x86/urgent] x86: fix kernel panic on 32 bits when profiling

Commit-ID:  d1705c558c95418378b11a0be963fe1b3e2fa381
Gitweb:     http://git.kernel.org/tip/d1705c558c95418378b11a0be963fe1b3e2fa381
Author:     H. Peter Anvin <[email protected]>
AuthorDate: Mon, 12 Oct 2009 11:32:31 -0700
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 12 Oct 2009 11:53:51 -0700

x86: fix kernel panic on 32 bits when profiling

Latest kernel has a kernel panic in booting on i386 machine when profile=2 setting in cmdline. It is due to 'sp' being incorrect in profile_pc().

BUG: unable to handle kernel NULL pointer dereference at 00000246
IP: [<c01288b6>] profile_pc+0x2a/0x48
*pde = 00000000
Oops: 0000 [#1] SMP

This differs from the original version by Alex Shi in that we use the kernel_stack_pointer() inline already defined in <asm/ptrace.h> for this purpose, instead of #ifdef.

Cc "Chen, Tim C" <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Andrew Morton <[email protected]>
---
 arch/x86/kernel/time.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/kernel/time.c +2 -1
index dcb00d2..be25734 100644
@@ -38,7 +38,8 @@ unsigned long profile_pc(struct pt_regs *regs)
 #ifdef CONFIG_FRAME_POINTER
 		return *(unsigned long *)(regs->bp + sizeof(long));
 #else
-		unsigned long *sp = (unsigned long *)regs->sp;
+		unsigned long *sp =
+			(unsigned long *)kernel_stack_pointer(regs);
 		/*
 		 * Return address is either directly at stack pointer
 		 * or above a saved flags. Eflags has bits 22-31 zero,

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�