glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify handling of unexpected tracees

Browse Source 
* strace.c (maybe_allocate_tcb) <WIFSTOPPED(status) && !followfork>:
Remove the dance around possible re-injection of WSTOPSIG(status)
as the only observable stop here is the initial ptrace-stop.
This commit is contained in:
Дмитрий Левин 2017-08-06 15:10:56 +00:00
parent 7a35b711df
commit 330f4633d5
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
strace.c
View File

@ -2093,22 +2093,13 @@ maybe_allocate_tcb(const int pid, int status)
} else {
/*
* This can happen if a clone call misused CLONE_PTRACE itself.
*
* There used to be a dance around possible re-injection of
* WSTOPSIG(status), but it was later removed as the only
* observable stop here is the initial ptrace-stop.
*/
unsigned int sig = WSTOPSIG(status);
if (use_seize) {
unsigned int event = (unsigned int) status >> 16;
if (event == PTRACE_EVENT_STOP)
sig = 0;
} else {
if (sig == SIGSTOP)
sig = 0;
}
ptrace(PTRACE_DETACH, pid, NULL, (unsigned long) sig);
error_msg("Detached unknown pid %d%s%s", pid,
sig ? " with signal " : "",
sig ? signame(sig) : "");
ptrace(PTRACE_DETACH, pid, NULL, 0L);
error_msg("Detached unknown pid %d", pid);
return NULL;
}
}