Re: Re: [PATCH -tip v8 01/26] [BUGFIX]kprobes/x86: Fix page-fault handling logic

[Masami Hiramatsu]

(2014/03/22 6:39), Steven Rostedt wrote:
>> diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
>> index 79a3f96..b482e96 100644
>> --- a/arch/x86/kernel/kprobes/core.c
>> +++ b/arch/x86/kernel/kprobes/core.c
>> @@ -897,9 +897,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
>>  	struct kprobe *cur = kprobe_running();
>>  	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
>>  
>> -	switch (kcb->kprobe_status) {
>> -	case KPROBE_HIT_SS:
>> -	case KPROBE_REENTER:
>> +	if (unlikely(regs->ip == (unsigned long)cur->ainsn.insn)) {
> 
> I wonder if we should add a:
> 
> 	WARN_ON(kcb->kprobe_status != KPROBE_HIT_SS &&
> 		kcb->kprobe_status != KPROBE_REENTER);

Ah, right. I'll add it for verifying the status.

Thanks!

-- 
Masami HIRAMATSU
IT Management Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt@xxxxxxxxxxx


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/