Skip to contentSkip to conversation

x86/kprobes: Fix to update kcb status flag after singlestepping

PATCH In review Masami Hiramatsu (Google) 3 participants 3 messages Aug 2, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/kprobes: Fix to update kcb status flag after singlestepping

From: Masami Hiramatsu (Google) <[email protected]>

Fix kprobes to update kcb (kprobes control block) status flag to KPROBE_HIT_SSDONE even if the kp->post_handler is not set. This may cause a kernel panic if another int3 user runs right after kprobes because kprobe_int3_handler() misunderstands the int3 is kprobe's single stepping int3.

---
 arch/x86/kernel/kprobes/core.c |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
arch/x86/kernel/kprobes/core.c +11 -7
index 7c4ab8870da4..74167dc5f55e 100644
@@ -814,16 +814,20 @@ set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
 static void kprobe_post_process(struct kprobe *cur, struct pt_regs *regs,
 			       struct kprobe_ctlblk *kcb)
 {
-	if ((kcb->kprobe_status != KPROBE_REENTER) && cur->post_handler) {
-		kcb->kprobe_status = KPROBE_HIT_SSDONE;
-		cur->post_handler(cur, regs, 0);
-	}
-
 	/* Restore back the original saved kprobes variables and continue. */
-	if (kcb->kprobe_status == KPROBE_REENTER)
+	if (kcb->kprobe_status == KPROBE_REENTER) {
+		/* This will restore both kcb and current_kprobe */
 		restore_previous_kprobe(kcb);
-	else
+	} else {
+		/*
+		 * Always update the kcb status because
+		 * reset_curent_kprobe() doesn't update kcb.
+		 */
+		kcb->kprobe_status = KPROBE_HIT_SSDONE;
+		if (cur->post_handler)
+			cur->post_handler(cur, regs, 0);
 		reset_current_kprobe();
+	}
 }
 NOKPROBE_SYMBOL(kprobe_post_process);
 
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · On Tue, 2 Aug 2022 15:04:16 +0900 "Masami Hiramatsu (Google)"…

From: Masami Hiramatsu (Google) <[email protected]>

Fix kprobes to update kcb (kprobes control block) status flag to KPROBE_HIT_SSDONE even if the kp->post_handler is not set. This may cause a kernel panic if another int3 user runs right after kprobes because kprobe_int3_handler() misunderstands the int3 is kprobe's single stepping int3.

Quoted 7 lines

---

I guess this will go through the tip tree?

-- Steve

#2 lore raw
Quoted 19 lines · Steven Rostedt
Quoted 8 lines · On Tue, 2 Aug 2022 15:04:16 +0900 "Masami Hiramatsu (Google)"…

From: Masami Hiramatsu (Google) <[email protected]>

Fix kprobes to update kcb (kprobes control block) status flag to KPROBE_HIT_SSDONE even if the kp->post_handler is not set. This may cause a kernel panic if another int3 user runs right after kprobes because kprobe_int3_handler() misunderstands the int3 is kprobe's single stepping int3.

Quoted 7 lines

---

Quoted 3 lines

I guess this will go through the tip tree?

Yeah, it's already in tip:perf/urgent.

Thanks,

Ingo