From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 20 Aug 2025 17:49:56 +0000 (+0200)
Subject: uprobes/x86: Add SLS mitigation to the trampolines
X-Git-Tag: v6.18-rc1~196^2~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=354492a0e1bc4a408e26ebe14166bd1064182439;p=thirdparty%2Flinux.git

uprobes/x86: Add SLS mitigation to the trampolines

It is trivial; no reason not to.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20250821123657.277506098@infradead.org
---

diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index 643027e35c461..0a8c0a4a54233 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"
 );