Page MenuHomeFreeBSD
Files F151747095

D20223.id57252.diff
No OneTemporary
Actions

D20223.id57252.diff
View Options

Index: sys/amd64/linux/linux_ptrace.c
===================================================================
--- sys/amd64/linux/linux_ptrace.c
+++ sys/amd64/linux/linux_ptrace.c
@@ -338,18 +338,27 @@
map_regs_to_linux(&b_reg, &l_reg);
- /*
- * The strace(1) utility depends on RAX being set to -ENOSYS
- * on syscall entry.
- */
error = kern_ptrace(td, PT_LWPINFO, pid, &lwpinfo, sizeof(lwpinfo));
if (error != 0) {
printf("%s: PT_LWPINFO failed with error %d\n", __func__, error);
return (error);
}
- if (lwpinfo.pl_flags & PL_FLAG_SCE)
- l_reg.rax = -38; // XXX: Don't hardcode?
+ 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. ]
+ */
+ l_reg.rax = -38; /* -ENOSYS */
+ /*
+ * Undo the mangling done in exception.S:fast_syscall_common().
+ */
+ l_reg.r10 = l_reg.rcx;
+ }
+
error = copyout(&l_reg, (void *)data, sizeof(l_reg));
return (error);
}
@@ -399,21 +408,27 @@
map_regs_to_linux_regset(&b_reg, fsbase, gsbase, &l_regset);
- /*
- * 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. ]
- */
error = kern_ptrace(td, PT_LWPINFO, pid, &lwpinfo, sizeof(lwpinfo));
if (error != 0) {
printf("%s: PT_LWPINFO failed with error %d\n",
__func__, error);
return (error);
}
- if (lwpinfo.pl_flags & PL_FLAG_SCE)
- l_regset.rax = -38; // XXX: Don't hardcode?
+ 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. ]
+ */
+ l_regset.rax = -38; /* -ENOSYS */
+
+ /*
+ * Undo the mangling done in exception.S:fast_syscall_common().
+ */
+ l_regset.r10 = l_regset.rcx;
+ }
len = MIN(iov.iov_len, sizeof(l_regset));
error = copyout(&l_regset, (void *)iov.iov_base, len);

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 11, 10:02 AM (9 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31283719
Default Alt Text
D20223.id57252.diff (2 KB)

Event Timeline