Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756174AbXLSV50 (ORCPT ); Wed, 19 Dec 2007 16:57:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752891AbXLSV5T (ORCPT ); Wed, 19 Dec 2007 16:57:19 -0500 Received: from mx1.redhat.com ([66.187.233.31]:47342 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750846AbXLSV5S (ORCPT ); Wed, 19 Dec 2007 16:57:18 -0500 Message-ID: <47699194.3060809@redhat.com> Date: Wed, 19 Dec 2007 16:48:04 -0500 From: Masami Hiramatsu User-Agent: Thunderbird 2.0.0.9 (X11/20071115) MIME-Version: 1.0 To: Ananth N Mavinakayanahalli , Jim Keniston , Ingo Molnar CC: Roland McGrath , prasanna@in.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net, Harvey Harrison , systemtap-ml , LKML , Arjan van de Ven Subject: [PATCH 1/3] x86: fix kprobe_handler reenable preemption X-Enigmail-Version: 0.95.5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1097 Lines: 36 Fix a preemption bug in kprobe_handler(). It has to call preempt_enable() before returning. Signed-off-by: Masami Hiramatsu --- arch/x86/kernel/kprobes.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: b/arch/x86/kernel/kprobes.c =================================================================== --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c @@ -467,7 +467,8 @@ static int __kprobes kprobe_handler(stru arch_disarm_kprobe(p); regs->ip = (unsigned long)p->addr; reset_current_kprobe(); - return 1; + ret = 1; + goto no_kprobe; #endif } /* We have reentered the kprobe_handler(), since -- Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: mhiramat@redhat.com, masami.hiramatsu.pt@hitachi.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/