diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-24 22:57:17 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-24 22:57:17 +0000 |
| commit | 62c5ca3e36a0f3646267071636ee5b9ed00fb88b (patch) | |
| tree | 1e4bb6f24275c2cd55ec29ce1af063f9b19d88b3 /pkg/sentry/platform/ptrace | |
| parent | fb82e0dde1357ec6a4106b9edd7b6c1dd399bb02 (diff) | |
| parent | c5486f512224dc0fda6b3509c1eb9f83dff950b4 (diff) | |
Merge c5486f51 (automated)
Diffstat (limited to 'pkg/sentry/platform/ptrace')
| -rw-r--r-- | pkg/sentry/platform/ptrace/subprocess.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/platform/ptrace/subprocess.go b/pkg/sentry/platform/ptrace/subprocess.go index dca8e4c0e..3656611ed 100644 --- a/pkg/sentry/platform/ptrace/subprocess.go +++ b/pkg/sentry/platform/ptrace/subprocess.go @@ -376,7 +376,7 @@ func (t *thread) init() { syscall.PTRACE_SETOPTIONS, uintptr(t.tid), 0, - syscall.PTRACE_O_TRACESYSGOOD, + syscall.PTRACE_O_TRACESYSGOOD|syscall.PTRACE_O_TRACEEXIT, 0, 0) if errno != 0 { panic(fmt.Sprintf("ptrace set options failed: %v", errno)) @@ -419,7 +419,7 @@ func (t *thread) syscall(regs *syscall.PtraceRegs) (uintptr, error) { // between syscall-enter-stop and syscall-exit-stop; it happens *after* // syscall-exit-stop.)" - ptrace(2), "Syscall-stops" if sig := t.wait(stopped); sig != (syscallEvent | syscall.SIGTRAP) { - panic(fmt.Sprintf("wait failed: expected SIGTRAP, got %v [%d]", sig, sig)) + t.dumpAndPanic(fmt.Sprintf("wait failed: expected SIGTRAP, got %v [%d]", sig, sig)) } // Grab registers. |