All of
 help / color / mirror / Atom feed
From: "Masami Hiramatsu (Google)" <>
Cc: Steven Rostedt <>,
	Masami Hiramatsu <>,
	Ingo Molnar <>,
	Suleiman Souhlal <>, bpf <>,, Borislav Petkov <>,
	Peter Zijlstra <>,
	Josh Poimboeuf <>,
	Nadav Amit <>
Subject: [PATCH -tip v4 1/2] x86/kprobes: Fix kprobes instruction boudary check with CONFIG_RETHUNK
Date: Mon, 19 Dec 2022 23:35:10 +0900	[thread overview]
Message-ID: <167146051026.1374301.392728975473572291.stgit@devnote3> (raw)
In-Reply-To: <167146050052.1374301.10407562178447545337.stgit@devnote3>

From: Masami Hiramatsu (Google) <>

Since the CONFIG_RETHUNK and CONFIG_SLS will use INT3 for stopping
speculative execution after RET instruction, kprobes always failes to
check the probed instruction boundary by decoding the function body if
the probed address is after such sequence. (Note that some conditional
code blocks will be placed after function return, if compiler decides
it is not on the hot path.)

This is because kprobes expects kgdb puts the INT3 as a software
breakpoint and it will replace the original instruction.
But these INT3 are not such purpose, it doesn't need to recover the
original instruction.

To avoid this issue, kprobes checks whether the INT3 is owned by
kgdb or not, and if so, stop decoding and make it fail. The other
INT3 will come from CONFIG_RETHUNK/CONFIG_SLS and those can be
treated as a one-byte instruction.

Signed-off-by: Masami Hiramatsu (Google) <>
Suggested-by: Peter Zijlstra <>
Fixes: e463a09af2f0 ("x86: Add straight-line-speculation mitigation")
 arch/x86/kernel/kprobes/core.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 66299682b6b7..b36f3c367cb2 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -37,6 +37,7 @@
 #include <linux/extable.h>
 #include <linux/kdebug.h>
 #include <linux/kallsyms.h>
+#include <linux/kgdb.h>
 #include <linux/ftrace.h>
 #include <linux/kasan.h>
 #include <linux/moduleloader.h>
@@ -281,12 +282,15 @@ static int can_probe(unsigned long paddr)
 		if (ret < 0)
 			return 0;
-		 * Another debugging subsystem might insert this breakpoint.
-		 * In that case, we can't recover it.
+		 * If there is a dynamically installed kgdb sw breakpoint,
+		 * this function should not be probed.
-		if (insn.opcode.bytes[0] == INT3_INSN_OPCODE)
+		if (insn.opcode.bytes[0] == INT3_INSN_OPCODE &&
+		    kgdb_has_hit_break(addr))
 			return 0;
 		addr += insn.length;

  reply	other threads:[~2022-12-19 14:35 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-19 14:35 [PATCH -tip v4 0/2] x86/kprobes: Fix to check not-kprobe's int3 correctly Masami Hiramatsu (Google)
2022-12-19 14:35 ` Masami Hiramatsu (Google) [this message]
2022-12-27 11:59   ` [tip: x86/urgent] x86/kprobes: Fix kprobes instruction boudary check with CONFIG_RETHUNK tip-bot2 for Masami Hiramatsu (Google)
2022-12-19 14:35 ` [PATCH -tip v4 2/2] x86/kprobes: Fix optprobe optimization " Masami Hiramatsu (Google)
2022-12-27 11:59   ` [tip: x86/urgent] " tip-bot2 for Masami Hiramatsu (Google)
2022-12-19 15:23 ` [PATCH -tip v4 0/2] x86/kprobes: Fix to check not-kprobe's int3 correctly Peter Zijlstra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=167146051026.1374301.392728975473572291.stgit@devnote3 \ \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.