2007-12-19 21:57:26

by Masami Hiramatsu

Subject: [PATCH 1/3] x86: fix kprobe_handler reenable preemption

Fix a preemption bug in kprobe_handler(). It has to call preempt_enable()
before returning.

Signed-off-by: Masami Hiramatsu <[email protected]>
---
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: [email protected], [email protected]

2007-12-20 09:17:01

by Ingo Molnar

Subject: Re: [PATCH 1/3] x86: fix kprobe_handler reenable preemption

* Masami Hiramatsu <[email protected]> wrote:

> Fix a preemption bug in kprobe_handler(). It has to call
> preempt_enable() before returning.

thanks - i've applied all 3 kprobes patches from you. (for v2.6.25)

Ingo

2007-12-20 10:23:01

by Jaswinder Singh

Subject: Re: [PATCH 1/3] x86: fix kprobe_handler reenable preemption

v2.6.25 or v2.6.24 ?

On Dec 20, 2007 2:45 PM, Ingo Molnar <[email protected]> wrote:
>
> * Masami Hiramatsu <[email protected]> wrote:
>
> > Fix a preemption bug in kprobe_handler(). It has to call
> > preempt_enable() before returning.
>
> thanks - i've applied all 3 kprobes patches from you. (for v2.6.25)
>
> Ingo
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

2007-12-20 10:40:54

by Ingo Molnar

Subject: Re: [PATCH 1/3] x86: fix kprobe_handler reenable preemption

* Jaswinder Singh <[email protected]> wrote:

> v2.6.25 or v2.6.24 ?

see: http://www.zip.com.au/~akpm/linux/patches/stuff/top-posting.txt

> On Dec 20, 2007 2:45 PM, Ingo Molnar <[email protected]> wrote:
> >
> > * Masami Hiramatsu <[email protected]> wrote:
> >
> > > Fix a preemption bug in kprobe_handler(). It has to call
> > > preempt_enable() before returning.
> >
> > thanks - i've applied all 3 kprobes patches from you. (for v2.6.25)
/^^^^^^^^^^^^
also see: ---------------------------------------------/

(this bug is not present in .24)

Ingo