aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2021-05-04 13:11:01 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2021-05-04 14:21:06 +0000
commit023bff799098cac28732f2800c967f0248d2eb47 (patch)
tree58b25e101aea3df2bf23f82c0fcfaef0a5c344fb
parentb59851e99c20f3a72c34bdf9919e3bf49b894e4e (diff)
downloadsrc-023bff799098cac28732f2800c967f0248d2eb47.tar.gz
src-023bff799098cac28732f2800c967f0248d2eb47.zip
linux(4): fix ptrace(2) to properly handle orig_rax
This fixes strace(1) erroneously reporting return values as "Function not implemented", combined with reporting the binary ABI as X32. Very similar code in linux_ptrace_getregs() is left as it is - it's probably wrong too, but I don't have a way to test it. Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D29927
-rw-r--r--sys/amd64/linux/linux_ptrace.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/amd64/linux/linux_ptrace.c b/sys/amd64/linux/linux_ptrace.c
index 76ad9b1e25c4..43ecd8892e0f 100644
--- a/sys/amd64/linux/linux_ptrace.c
+++ b/sys/amd64/linux/linux_ptrace.c
@@ -506,18 +506,18 @@ linux_ptrace_getregset_prstatus(struct thread *td, pid_t pid, l_ulong data)
}
if (lwpinfo.pl_flags & PL_FLAG_SCE) {
/*
- * The strace(1) utility depends on RAX being set to -ENOSYS
- * on syscall entry; otherwise it loops printing those:
- *
- * [ Process PID=928 runs in 64 bit mode. ]
- * [ Process PID=928 runs in x32 mode. ]
+ * Undo the mangling done in exception.S:fast_syscall_common().
*/
- l_regset.rax = -38; /* -ENOSYS */
+ l_regset.r10 = l_regset.rcx;
+ }
+ if (lwpinfo.pl_flags & (PL_FLAG_SCE | PL_FLAG_SCX)) {
/*
- * Undo the mangling done in exception.S:fast_syscall_common().
+ * In Linux, the syscall number - passed to the syscall
+ * as rax - is preserved in orig_rax; rax gets overwritten
+ * with syscall return value.
*/
- l_regset.r10 = l_regset.rcx;
+ l_regset.orig_rax = lwpinfo.pl_syscall_code;
}
len = MIN(iov.iov_len, sizeof(l_regset));