Unverified Commit a7dc8eb5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3272 x86/kprobes: Fix the error judgment for debug exceptions 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Huafei <lihuafei1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/R3VW3NZEN4ICYCACOM277VMT7IURUSXC/ 
 
https://gitee.com/openeuler/kernel/issues/I7EU4Q 
 
Link:https://gitee.com/openeuler/kernel/pulls/3272

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents bffb3bc9 29bef482

arch/x86/kernel/kprobes/core.c

+9 −1
Original line number Diff line number Diff line
@@ -900,7 +900,15 @@ int kprobe_debug_handler(struct pt_regs *regs) 
	struct kprobe *cur = kprobe_running();

	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();



	if (!cur)

	if (!cur || !cur->ainsn.insn)

		return 0;



	/* kprobe will change the status from KPROBE_HIT_ACTIVE to

	 * KPROBE_HIT_SS or KPROBE_REENTER before single-step execution, so

	 * if the current status is KPROBE_HIT_ACTIVE, its not a debug

	 * exception triggered by kprobe.

	 */

	if (kcb->kprobe_status == KPROBE_HIT_ACTIVE)

		return 0;



	resume_execution(cur, regs, kcb);