This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
[PATCH 1/4] x86: fix jprobe_saved_sp handling
- From: Harvey Harrison <harvey dot harrison at gmail dot com>
- To: Ingo Molnar <mingo at elte dot hu>
- Cc: Ananth N Mavinakayanahalli <ananth at in dot ibm dot com>, Jim Keniston <jkenisto at us dot ibm dot com>, Roland McGrath <roland at redhat dot com>, Arjan van de Ven <arjan at infradead dot org>, prasanna at in dot ibm dot com, anil dot s dot keshavamurthy at intel dot com, davem at davemloft dot net, systemtap-ml <systemtap at sources dot redhat dot com>, LKML <linux-kernel at vger dot kernel dot org>, Andrew Morton <akpm at linux-foundation dot org>
- Date: Mon, 17 Dec 2007 13:26:55 -0800
- Subject: [PATCH 1/4] x86: fix jprobe_saved_sp handling
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc:content-type:date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=KkEaSqPgKiJN+Tf0sgVoOVYQp/eu8qB+deUmvavRvhw=; b=RhEhzVHI9jwt6bfBhv7AayA33BrHzRAafkyEifR4wSa3hb00QjRgnpWrjn4eJgswoMHINeOXpzhen0U4nK2U4tccMtTPq8YOmQWsFL4Omup/eTAeEa0QDzgPOBxFlVcRFCCYSR2ObsAz2GBm4ZkO+qCGAWoJFLi8nv/oml9RkRE=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version:x-mailer:content-transfer-encoding; b=AbQ/84F8M9/1Lvl+UaAqNfNfdiyc7P/dPi+lsjlIv1mTMRtlSdcPq7mGKJ+U/gDcGGW2rQ76fqT/T5PykcP6fBD1QYBFd2voNPHedIQq5oTXcBQa3ZHPut4w8TqQeqE2TBYUREwnUK+NnK4ATb8Ijfz7lrrkizLO4YZS/5RftE4=
This patch fixes a bug of jprobe and cleans up. jprobe for x86-64
can cause kernel page fault when the jprobe_return() is called from
incorrect function. Anyway, that path finally invokes BUG() macro,
so this is not so serious.
Based on patch from Masami Hiramatsu <mhiramat@redhat.com>
- Use jprobe_saved_regs instead getting it from stack.
(Especially on x86-64, it may get incorrect data, because
pt_regs can not be get by using container_of(rsp))
- Change the type of stack pointer to unsigned long *.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
arch/x86/kernel/kprobes.c | 8 ++------
include/asm-x86/kprobes.h | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index e5b7d07..9130c01 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -1022,16 +1022,12 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
if ((addr > (u8 *) jprobe_return) && (addr < (u8 *) jprobe_return_end)) {
#ifdef CONFIG_X86_32
if (®s->sp != kcb->jprobe_saved_sp) {
- struct pt_regs *saved_regs =
- container_of(kcb->jprobe_saved_sp,
- struct pt_regs, sp);
+ struct pt_regs *saved_regs = &kcb->jprobe_saved_sp;
printk("current sp %p does not match saved sp %p\n",
®s->sp, kcb->jprobe_saved_sp);
#else
if ((long *)regs->sp != kcb->jprobe_saved_sp) {
- struct pt_regs *saved_regs =
- container_of(kcb->jprobe_saved_sp,
- struct pt_regs, sp);
+ struct pt_regs *saved_regs = &kcb->jprobe_saved_sp;
printk("current sp %p does not match saved sp %p\n",
(long *)regs->sp, kcb->jprobe_saved_sp);
#endif
diff --git a/include/asm-x86/kprobes.h b/include/asm-x86/kprobes.h
index e348ed6..7319c62 100644
--- a/include/asm-x86/kprobes.h
+++ b/include/asm-x86/kprobes.h
@@ -79,7 +79,7 @@ struct kprobe_ctlblk {
unsigned long kprobe_status;
unsigned long kprobe_old_flags;
unsigned long kprobe_saved_flags;
- long *jprobe_saved_sp;
+ unsigned long *jprobe_saved_sp;
struct pt_regs jprobe_saved_regs;
kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE];
struct prev_kprobe prev_kprobe;
--
1.5.4.rc0.1083.gf568