diff options
| author | markj <markj@FreeBSD.org> | 2014-08-09 15:00:03 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2014-08-09 15:00:03 +0000 |
| commit | 4eeea9f0c4d9eb8c73fe7eb5297204da53bcfe8a (patch) | |
| tree | d7933a38f02506f07e209f08385e819e23df9b4c /lib/libproc/proc_util.c | |
| parent | 57990c0ba46d6aa5c30d4e35eaea0bf3ee59ec96 (diff) | |
| download | FreeBSD-src-4eeea9f0c4d9eb8c73fe7eb5297204da53bcfe8a.zip FreeBSD-src-4eeea9f0c4d9eb8c73fe7eb5297204da53bcfe8a.tar.gz | |
MFC r265308:
If the traced process stops because it received a signal, libproc needs
to ensure that the signal is forwarded when proc_continue() is called.
Diffstat (limited to 'lib/libproc/proc_util.c')
| -rw-r--r-- | lib/libproc/proc_util.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/lib/libproc/proc_util.c b/lib/libproc/proc_util.c index 1c3d522..4d9aa20 100644 --- a/lib/libproc/proc_util.c +++ b/lib/libproc/proc_util.c @@ -35,10 +35,9 @@ #include <sys/wait.h> #include <err.h> #include <errno.h> -#include <unistd.h> -#include <stdio.h> #include <signal.h> #include <string.h> +#include <unistd.h> #include "_libproc.h" int @@ -59,11 +58,14 @@ proc_clearflags(struct proc_handle *phdl, int mask) int proc_continue(struct proc_handle *phdl) { + int pending = 0; if (phdl == NULL) return (-1); - if (ptrace(PT_CONTINUE, phdl->pid, (caddr_t)(uintptr_t) 1, 0) != 0) + if (phdl->status == PS_STOP && WSTOPSIG(phdl->wstat) != SIGTRAP) + pending = WSTOPSIG(phdl->wstat); + if (ptrace(PT_CONTINUE, phdl->pid, (caddr_t)(uintptr_t)1, pending) != 0) return (-1); phdl->status = PS_RUN; @@ -208,12 +210,16 @@ proc_getlwpstatus(struct proc_handle *phdl) return (NULL); siginfo = &lwpinfo.pl_siginfo; if (lwpinfo.pl_event == PL_EVENT_SIGNAL && - (lwpinfo.pl_flags & PL_FLAG_SI) && - siginfo->si_signo == SIGTRAP && - (siginfo->si_code == TRAP_BRKPT || - siginfo->si_code == TRAP_TRACE)) { - psp->pr_why = PR_FAULTED; - psp->pr_what = FLTBPT; + (lwpinfo.pl_flags & PL_FLAG_SI) != 0) { + if (siginfo->si_signo == SIGTRAP && + (siginfo->si_code == TRAP_BRKPT || + siginfo->si_code == TRAP_TRACE)) { + psp->pr_why = PR_FAULTED; + psp->pr_what = FLTBPT; + } else { + psp->pr_why = PR_SIGNALLED; + psp->pr_what = siginfo->si_signo; + } } else if (lwpinfo.pl_flags & PL_FLAG_SCE) { psp->pr_why = PR_SYSENTRY; } else if (lwpinfo.pl_flags & PL_FLAG_SCX) { |
