[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <175611749130.1420.11311386444838277257.tip-bot2@tip-bot2>
Date: Mon, 25 Aug 2025 10:24:51 -0000
From: "tip-bot2 for Peter Zijlstra" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@...radead.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: perf/core] uprobes/x86: Add SLS mitigation to the trampolines
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 354492a0e1bc4a408e26ebe14166bd1064182439
Gitweb: https://git.kernel.org/tip/354492a0e1bc4a408e26ebe14166bd1064182439
Author: Peter Zijlstra <peterz@...radead.org>
AuthorDate: Wed, 20 Aug 2025 19:49:56 +02:00
Committer: Peter Zijlstra <peterz@...radead.org>
CommitterDate: Thu, 21 Aug 2025 20:09:22 +02:00
uprobes/x86: Add SLS mitigation to the trampolines
It is trivial; no reason not to.
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Link: https://lkml.kernel.org/r/20250821123657.277506098@infradead.org
---
arch/x86/kernel/uprobes.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index 643027e..0a8c0a4 100644
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
@@ -336,6 +336,7 @@ asm (
* call ret.
*/
"ret\n"
+ "int3\n"
".global uretprobe_trampoline_end\n"
"uretprobe_trampoline_end:\n"
".popsection\n"
@@ -891,6 +892,7 @@ asm (
"pop %r11\n"
"pop %rcx\n"
"ret\n"
+ "int3\n"
".balign " __stringify(PAGE_SIZE) "\n"
".popsection\n"
);
Powered by blists - more mailing lists