]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
uprobes/x86: Add SLS mitigation to the trampolines
authorPeter Zijlstra <peterz@infradead.org>
Wed, 20 Aug 2025 17:49:56 +0000 (19:49 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Thu, 21 Aug 2025 18:09:22 +0000 (20:09 +0200)
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
arch/x86/kernel/uprobes.c

index 643027e35c46141b2c22530ed205d220e652419c..0a8c0a4a54233a389817a11dc5bdb723358faa95 100644 (file)
@@ -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"
 );