This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
[PATCH] kprobe: kprobe-booster fix for NX support on i386
- From: Masami Hiramatsu <hiramatu at sdl dot hitachi dot co dot jp>
- To: Andrew Morton <akpm at osdl dot org>, ananth at in dot ibm dot com, prasanna at in dot ibm dot com, anil dot s dot keshavamurthy at intel dot com
- Cc: Masami Hiramatsu <hiramatu at sdl dot hitachi dot co dot jp>, systemtap at sources dot redhat dot com, jkenisto at us dot ibm dot com, linux-kernel at vger dot kernel dot org, sugita at sdl dot hitachi dot co dot jp, soshima at redhat dot com, haoki at redhat dot com
- Date: Wed, 01 Mar 2006 13:40:45 +0900
- Subject: [PATCH] kprobe: kprobe-booster fix for NX support on i386
- References: <43DE0A4D.20908@sdl.hitachi.co.jp> <4402E920.5080402@sdl.hitachi.co.jp> <20060227185012.037c8830.akpm@osdl.org> <4403E894.4050300@sdl.hitachi.co.jp>
Hi, Andrew
Here is the patch to fix kprobe-booster against linux-2.6.16-rc5-mm1.
- Fix to assign the correct address of the instruction buffer.
From linux-2.6.16-rc5, the ainsn.insn on i386 arch became a pointer
instead of an array itself.
Best regards,
--
Masami HIRAMATSU
2nd Research Dept.
Hitachi, Ltd., Systems Development Laboratory
E-mail: hiramatu@sdl.hitachi.co.jp
Signed-off-by: Masami Hiramatsu <hiramatu@sdl.hitachi.co.jp>
kprobes.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -Narup a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c
--- a/arch/i386/kernel/kprobes.c 2006-03-01 09:53:22.000000000 +0900
+++ b/arch/i386/kernel/kprobes.c 2006-03-01 09:56:58.000000000 +0900
@@ -313,7 +313,7 @@ static int __kprobes kprobe_handler(stru
!p->post_handler && !p->break_handler ) {
/* Boost up -- we can execute copied instructions directly */
reset_current_kprobe();
- regs->eip = (unsigned long)&p->ainsn.insn;
+ regs->eip = (unsigned long)p->ainsn.insn;
preempt_enable_no_resched();
return 1;
}