d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for PTRACE_O_TRACEEXIT to linuxulator ptrace(2).

Browse Source 
This fixes strace 4.25 from Ubuntu 19.04.

Reviewed by:	emaste
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D20689
This commit is contained in:
Edward Tomasz Napierala 2019-07-04 19:46:58 +00:00
parent de7ea4e414
commit 8037385293
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/amd64/linux/linux_ptrace.c
View File

@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$");
#define LINUX_PTRACE_GETREGSET 0x4204
#define LINUX_PTRACE_SEIZE 0x4206
#define LINUX_PTRACE_EVENT_EXIT 6
#define LINUX_PTRACE_O_TRACESYSGOOD 1
#define LINUX_PTRACE_O_TRACEFORK 2
#define LINUX_PTRACE_O_TRACEVFORK 4
@ -139,6 +141,9 @@ linux_ptrace_status(struct thread *td, pid_t pid, int status)
if ((pem->ptrace_flags & LINUX_PTRACE_O_TRACESYSGOOD) &&
lwpinfo.pl_flags & PL_FLAG_SCX)
status |= (LINUX_SIGTRAP | 0x80) << 8;
if ((pem->ptrace_flags & LINUX_PTRACE_O_TRACEEXIT) &&
lwpinfo.pl_flags & PL_FLAG_EXITED)
status |= (LINUX_SIGTRAP | LINUX_PTRACE_EVENT_EXIT << 8) << 8;
LINUX_PEM_SUNLOCK(pem);
return (status);
@ -359,9 +364,9 @@ linux_ptrace_setoptions(struct thread *td, pid_t pid, l_ulong data)
mask |= PTRACE_VFORK; /* XXX: Close enough? */
if (data & LINUX_PTRACE_O_TRACEEXIT) {
linux_msg(td, "PTRACE_O_TRACEEXIT not implemented; "
"returning EINVAL");
return (EINVAL);
pem->ptrace_flags |= LINUX_PTRACE_O_TRACEEXIT;
} else {
pem->ptrace_flags &= ~LINUX_PTRACE_O_TRACEEXIT;
}
return (kern_ptrace(td, PT_SET_EVENT_MASK, pid, &mask, sizeof(mask)));