Skip to contentSkip to conversation

x86: fix kernel_trap_sp()

PATCH In review Masami Hiramatsu 1 participant 1 message Apr 2, 2009

Subsystems (3)
x86 KVM ptrace support
lore
Share & tools
lore

Masami Hiramatsu

author
#0 lore raw

PATCH v4 1/6 x86: fix kernel_trap_sp()

Use &regs->sp instead of regs for getting the top of stack in kernel mode. (on x86-64, regs->sp always points the top of stack)

Signed-off-by Masami Hiramatsu <[email protected]>
Cc Harvey Harrison <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Jan Blunck <[email protected]>

---

 arch/x86/include/asm/ptrace.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/ptrace.h +2 -2
index e304b66..aed0894 100644
@@ -187,14 +187,14 @@ static inline int v8086_mode(struct pt_regs *regs)
 
 /*
  * X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode
- * when it traps.  So regs will be the current sp.
+ * when it traps.  So &regs->sp will be the current sp.
  *
  * This is valid only for kernel mode traps.
  */
 static inline unsigned long kernel_trap_sp(struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_32
-	return (unsigned long)regs;
+	return (unsigned long)&regs->sp;
 #else
 	return regs->sp;
 #endif
Signature · 7 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America) Inc.
Software Solutions Division

e-mail: [email protected]