diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index ee85f1b258d0a489e3eec00225329def198c33cc..d032b38eccdc7add42c2359d2e3307fc14ab3df0 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -891,7 +891,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);