From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19778 invoked by alias); 1 Mar 2006 04:41:02 -0000 Received: (qmail 19770 invoked by uid 22791); 1 Mar 2006 04:41:01 -0000 X-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00,UNPARSEABLE_RELAY X-Spam-Check-By: sourceware.org Received: from mail8.hitachi.co.jp (HELO mail8.hitachi.co.jp) (133.145.228.43) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 01 Mar 2006 04:40:57 +0000 Received: from mlsv7.hitachi.co.jp by mail8.hitachi.co.jp (8.9.3p3/3.7W-mail8) id NAA11564; Wed, 1 Mar 2006 13:40:54 +0900 Received: from mfilter-s3.hitachi.co.jp by mlsv7.hitachi.co.jp (8.12.11/8.12.11) id k214erl5018246; Wed, 1 Mar 2006 13:40:53 +0900 Received: from vshuts1.hitachi.co.jp (unverified) by mfilter-s3.hitachi.co.jp (Content Technologies SMTPRS 4.3.17) with SMTP id ; Wed, 1 Mar 2006 13:40:53 +0900 Received: from hsdlgw92.sdl.hitachi.co.jp ([133.144.7.20]) by vshuts1.hitachi.co.jp with SMTP id M2006030113404910870 ; Wed, 01 Mar 2006 13:40:52 +0900 Received: from vgate2.sdl.hitachi.co.jp by hsdlgw92.sdl.hitachi.co.jp (8.9.3/3.7W01100113) id NAA17691; Wed, 1 Mar 2006 13:40:50 +0900 Received: from maila.sdl.hitachi.co.jp ([133.144.14.196]) by vgate2.sdl.hitachi.co.jp (SAVSMTP 3.1.1.32) with SMTP id M2006030113404904686 ; Wed, 01 Mar 2006 13:40:49 +0900 Received: from [192.168.16.226] ([192.168.16.226]) by maila.sdl.hitachi.co.jp (8.13.1/3.7W04031011) with ESMTP id k214enle032686; Wed, 1 Mar 2006 13:40:49 +0900 Message-ID: <440525CD.4090505@sdl.hitachi.co.jp> Date: Wed, 01 Mar 2006 04:41:00 -0000 From: Masami Hiramatsu User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 To: Andrew Morton , ananth@in.ibm.com, prasanna@in.ibm.com, anil.s.keshavamurthy@intel.com CC: Masami Hiramatsu , systemtap@sources.redhat.com, jkenisto@us.ibm.com, linux-kernel@vger.kernel.org, sugita@sdl.hitachi.co.jp, soshima@redhat.com, haoki@redhat.com 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> In-Reply-To: <4403E894.4050300@sdl.hitachi.co.jp> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org X-SW-Source: 2006-q1/txt/msg00662.txt.bz2 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 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; }