x86/uprobes: Keep shadow stack in sync for emulated CALLs
PATCH v2 1/2 x86/uprobes: Keep shadow stack in sync for emulated CALLs
Uprobe CALL emulation updates the normal user stack, but not the CET user shadow stack. The subsequent RET then sees a stale shadow stack entry and raises #CP.
Update the relative CALL emulation and XOL CALL fixup paths to keep the shadow stack in sync.
---
v2:
- propagate error from shshk_update_last_frame() rather than returning -ERESTART in default_post_xol_op(). (Oleg)
v1: https://lore.kernel.org/all/[email protected]/
arch/x86/kernel/uprobes.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/x86/kernel/uprobes.c +11 -1
@@ -1246,9 +1246,15 @@ static int default_post_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regslong correction = utask->vaddr - utask->xol_vaddr; regs->ip += correction; }else if (auprobe->defparam.fixups &UPROBE_FIX_CALL ) { +unsigned long retaddr = utask->vaddr + auprobe->defparam.ilen; +int err; + regs->sp +=sizeof_long (regs);/* Pop incorrect return address */ -if (emulate_push_stack (regs, utask->vaddr + auprobe->defparam.ilen)) +if (emulate_push_stack (regs, retaddr))return -ERESTART ; + err =shstk_update_last_frame (retaddr); +if (err) +return err; }/* popf; tell the caller to not touch TF */ if (auprobe->defparam.fixups &UPROBE_FIX_SETF )
@@ -1338,6 +1344,10 @@ static bool branch_emulate_op(struct arch_uprobe *auprobe, struct pt_regs *regs)*/ if (emulate_push_stack (regs, new_ip))return false; +if (shstk_push (new_ip) == -EFAULT ) { + regs->sp +=sizeof_long (regs); +return false; + } }else if (!check_jmp_cond (auprobe, regs)) { offs =0 ; }
Signature · 1 line
2.53.0
PATCH v2 2/2 selftests/x86: Add shadow stack uprobe CALL test
Add coverage for entry uprobes installed on CALL instructions while user shadow stack is enabled. The test puts an entry uprobe on a helper whose first instruction is a relative CALL, then verifies that the call/return sequence completes without SIGSEGV.
This catches regressions where x86 uprobe CALL emulation updates the regular user stack but leaves the CET shadow stack stale.
---
Notes:
v2:
- New patch. Adds a uprobe-on-CALL subtest to test_shadow_stack_64 to cover the fix in 1/2. Verifies that an emulated CALL through a uprobe leaves the shadow stack consistent with the user stack (no #CP on the matching RET).
.../testing/selftests/x86/test_shadow_stack.c | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+)
tools/testing/selftests/x86/test_shadow_stack.c +86 -0
@@ -873,6 +873,86 @@ static int test_uretprobe(void)return err; } +/* Keep the CALL first so the function address is exactly the probed CALL. */ +extern void uprobe_call_trigger (void ); +asm (".pushsection .text\n" +".global uprobe_call_target\n" +".type uprobe_call_target, @function\n" +"uprobe_call_target:\n" +" ret\n" +".size uprobe_call_target, .-uprobe_call_target\n" + +".global uprobe_call_trigger\n" +".type uprobe_call_trigger, @function\n" +"uprobe_call_trigger:\n" +" call uprobe_call_target\n" +" ret\n" +".size uprobe_call_trigger, .-uprobe_call_trigger\n" +".popsection\n" +); + +/* If CALL emulation misses the shadow stack update, this exits via SIGSEGV. */ +static int test_uprobe_call (void ) +{ +const size_t attr_sz =sizeof (struct perf_event_attr ); +const char *file ="/proc/self/exe" ; +int fd =-1 , type, err =1 ; +struct perf_event_attr attr; +struct sigaction sa = {}; +ssize_t offset; + + type =determine_uprobe_perf_type (); +if (type <0 ) { +if (type == -ENOENT ) +printf ("[SKIP]\tUprobe on CALL test, uprobes are not available\n" ); +return 0 ; + } + + offset =get_uprobe_offset (uprobe_call_trigger); +if (offset <0 ) +return 1 ; + + sa.sa_sigaction = segv_gp_handler; + sa.sa_flags =SA_SIGINFO ; +if (sigaction (SIGSEGV , &sa,NULL )) +return 1 ; + +/* Setup entry uprobe through perf event interface. */ +memset (&attr,0 , attr_sz); + attr.size = attr_sz; + attr.type = type; + attr.config =0 ; + attr.config1 = (__u64 )(unsigned long )file; + attr.config2 = offset; + + fd =syscall (__NR_perf_event_open, &attr,0 /* pid */ ,-1 /* cpu */ , +-1 /* group_fd */ ,PERF_FLAG_FD_CLOEXEC ); +if (fd <0 ) + goto out; + +if (sigsetjmp (jmp_buffer,1 )) + goto out; + +if (ARCH_PRCTL (ARCH_SHSTK_ENABLE ,ARCH_SHSTK_SHSTK )) + goto out; + +/* +* This either segfaults and goes through sigsetjmp above +* or succeeds and we're good. +*/ +uprobe_call_trigger (); + +printf ("[OK]\tUprobe on CALL test\n" ); + err =0 ; + +out: +ARCH_PRCTL (ARCH_SHSTK_DISABLE ,ARCH_SHSTK_SHSTK ); +signal (SIGSEGV ,SIG_DFL ); +if (fd >=0 ) +close (fd); +return err; +} +void segv_handler_ptrace (int signum,siginfo_t *si,void *uc) {/* The SSP adjustment caused a segfault. */
@@ -1071,6 +1151,12 @@ int main(int argc, char *argv[]) goto out; } +if (test_uprobe_call ()) { + ret =1 ; +printf ("[FAIL]\tuprobe on CALL test\n" ); + goto out; + } +return ret; out:
Signature · 1 line
2.53.0
[tip: perf/urgent] selftests/x86: Add shadow stack uprobe CALL test
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 5166973b20784b4627c7a657d546963d8c6e9b5a Gitweb: https://git.kernel.org/tip/5166973b20784b4627c7a657d546963d8c6e9b5a Author: David Windsor <[email protected]> AuthorDate: Mon, 29 Jun 2026 20:13:34 -04:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 02 Jul 2026 13:21:49 +02:00
selftests/x86: Add shadow stack uprobe CALL test
Add coverage for entry uprobes installed on CALL instructions while user shadow stack is enabled. The test puts an entry uprobe on a helper whose first instruction is a relative CALL, then verifies that the call/return sequence completes without SIGSEGV.
This catches regressions where x86 uprobe CALL emulation updates the regular user stack but leaves the CET shadow stack stale.
--- tools/testing/selftests/x86/test_shadow_stack.c | 86 ++++++++++++++++- 1 file changed, 86 insertions(+)
tools/testing/selftests/x86/test_shadow_stack.c +86 -0
@@ -873,6 +873,86 @@ out:return err; } +/* Keep the CALL first so the function address is exactly the probed CALL. */ +extern void uprobe_call_trigger (void ); +asm (".pushsection .text\n" +".global uprobe_call_target\n" +".type uprobe_call_target, @function\n" +"uprobe_call_target:\n" +" ret\n" +".size uprobe_call_target, .-uprobe_call_target\n" + +".global uprobe_call_trigger\n" +".type uprobe_call_trigger, @function\n" +"uprobe_call_trigger:\n" +" call uprobe_call_target\n" +" ret\n" +".size uprobe_call_trigger, .-uprobe_call_trigger\n" +".popsection\n" +); + +/* If CALL emulation misses the shadow stack update, this exits via SIGSEGV. */ +static int test_uprobe_call (void ) +{ +const size_t attr_sz =sizeof (struct perf_event_attr ); +const char *file ="/proc/self/exe" ; +int fd =-1 , type, err =1 ; +struct perf_event_attr attr; +struct sigaction sa = {}; +ssize_t offset; + + type =determine_uprobe_perf_type (); +if (type <0 ) { +if (type == -ENOENT ) +printf ("[SKIP]\tUprobe on CALL test, uprobes are not available\n" ); +return 0 ; + } + + offset =get_uprobe_offset (uprobe_call_trigger); +if (offset <0 ) +return 1 ; + + sa.sa_sigaction = segv_gp_handler; + sa.sa_flags =SA_SIGINFO ; +if (sigaction (SIGSEGV , &sa,NULL )) +return 1 ; + +/* Setup entry uprobe through perf event interface. */ +memset (&attr,0 , attr_sz); + attr.size = attr_sz; + attr.type = type; + attr.config =0 ; + attr.config1 = (__u64 )(unsigned long )file; + attr.config2 = offset; + + fd =syscall (__NR_perf_event_open, &attr,0 /* pid */ ,-1 /* cpu */ , +-1 /* group_fd */ ,PERF_FLAG_FD_CLOEXEC ); +if (fd <0 ) + goto out; + +if (sigsetjmp (jmp_buffer,1 )) + goto out; + +if (ARCH_PRCTL (ARCH_SHSTK_ENABLE ,ARCH_SHSTK_SHSTK )) + goto out; + +/* +* This either segfaults and goes through sigsetjmp above +* or succeeds and we're good. +*/ +uprobe_call_trigger (); + +printf ("[OK]\tUprobe on CALL test\n" ); + err =0 ; + +out: +ARCH_PRCTL (ARCH_SHSTK_DISABLE ,ARCH_SHSTK_SHSTK ); +signal (SIGSEGV ,SIG_DFL ); +if (fd >=0 ) +close (fd); +return err; +} +void segv_handler_ptrace (int signum,siginfo_t *si,void *uc) {/* The SSP adjustment caused a segfault. */
@@ -1071,6 +1151,12 @@ int main(int argc, char *argv[]) goto out; } +if (test_uprobe_call ()) { + ret =1 ; +printf ("[FAIL]\tuprobe on CALL test\n" ); + goto out; + } +return ret; out:
Quoted 10 lines · David Windsor
Uprobe CALL emulation updates the normal user stack, but not the CET user shadow stack. The subsequent RET then sees a stale shadow stack entry and raises #CP.
Update the relative CALL emulation and XOL CALL fixup paths to keep the shadow stack in sync.
Fixes 488af8ea7131 ("x86/shstk: Wire in shadow stack interface")Signed-off-by David Windsor <[email protected]>
Quoted 9 lines · David Windsor
Uprobe CALL emulation updates the normal user stack, but not the CET user shadow stack. The subsequent RET then sees a stale shadow stack entry and raises #CP.
Update the relative CALL emulation and XOL CALL fixup paths to keep the shadow stack in sync.
Fixes 488af8ea7131 ("x86/shstk: Wire in shadow stack interface")Signed-off-by David Windsor <[email protected]>
hi, lgtm
jirka
Quoted 46 lines
---
v2:
- propagate error fromshshk_update_last_frame()rather than returning-ERESTARTindefault_post_xol_op(). (Oleg)v1: https://lore.kernel.org/all/[email protected]/
arch/x86/kernel/uprobes.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)arch/x86/kernel/uprobes.c +11
-1@@ -1246,9 +1246,15 @@ static int default_post_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regslong correction = utask->vaddr - utask->xol_vaddr; regs->ip += correction; }else if (auprobe->defparam.fixups &UPROBE_FIX_CALL ) { +unsigned long retaddr = utask->vaddr + auprobe->defparam.ilen; +int err; + regs->sp +=sizeof_long (regs);/* Pop incorrect return address */ -if (emulate_push_stack (regs, utask->vaddr + auprobe->defparam.ilen)) +if (emulate_push_stack (regs, retaddr))return -ERESTART ; + err =shstk_update_last_frame (retaddr); +if (err) +return err; }/* popf; tell the caller to not touch TF */ if (auprobe->defparam.fixups &UPROBE_FIX_SETF )@@ -1338,6 +1344,10 @@ static bool branch_emulate_op(struct arch_uprobe *auprobe, struct pt_regs *regs)*/ if (emulate_push_stack (regs, new_ip))return false; +if (shstk_push (new_ip) == -EFAULT ) { + regs->sp +=sizeof_long (regs); +return false; + } }else if (!check_jmp_cond (auprobe, regs)) { offs =0 ; }Signature · 1 line
2.53.0
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: abf08854d224085e2ebb3ba660e7995909f47d6a Gitweb: https://git.kernel.org/tip/abf08854d224085e2ebb3ba660e7995909f47d6a Author: David Windsor <[email protected]> AuthorDate: Mon, 29 Jun 2026 20:13:33 -04:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 02 Jul 2026 13:21:49 +02:00
x86/uprobes: Keep shadow stack in sync for emulated CALLs
Uprobe CALL emulation updates the normal user stack, but not the CET user shadow stack. The subsequent RET then sees a stale shadow stack entry and raises #CP.
Update the relative CALL emulation and XOL CALL fixup paths to keep the shadow stack in sync.
--- arch/x86/kernel/uprobes.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/x86/kernel/uprobes.c +11 -1
@@ -1246,9 +1246,15 @@ static int default_post_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regslong correction = utask->vaddr - utask->xol_vaddr; regs->ip += correction; }else if (auprobe->defparam.fixups &UPROBE_FIX_CALL ) { +unsigned long retaddr = utask->vaddr + auprobe->defparam.ilen; +int err; + regs->sp +=sizeof_long (regs);/* Pop incorrect return address */ -if (emulate_push_stack (regs, utask->vaddr + auprobe->defparam.ilen)) +if (emulate_push_stack (regs, retaddr))return -ERESTART ; + err =shstk_update_last_frame (retaddr); +if (err) +return err; }/* popf; tell the caller to not touch TF */ if (auprobe->defparam.fixups &UPROBE_FIX_SETF )
@@ -1338,6 +1344,10 @@ static bool branch_emulate_op(struct arch_uprobe *auprobe, struct pt_regs *regs)*/ if (emulate_push_stack (regs, new_ip))return false; +if (shstk_push (new_ip) == -EFAULT ) { + regs->sp +=sizeof_long (regs); +return false; + } }else if (!check_jmp_cond (auprobe, regs)) { offs =0 ; }