diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-12-26 14:19:34 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-12-26 14:19:34 -0800 |
| commit | 5b9034cc18cb515f9534b61c7e4fe3c2a12985bc (patch) | |
| tree | 21b605ee4b5ad45ea65ff39884b14e61ec228a44 /pkg/sentry/platform/ptrace/subprocess.go | |
| parent | 7b5a59d5038df65a3d5ebb6a24e6b8a2aaa898ab (diff) | |
| parent | b6e31aadaa74b235c46bfa5e08b5ac66a3b4f8c5 (diff) | |
Merge pull request #1461 from xiaobo55x:ptrace_sysemu
PiperOrigin-RevId: 287225250
Diffstat (limited to 'pkg/sentry/platform/ptrace/subprocess.go')
| -rw-r--r-- | pkg/sentry/platform/ptrace/subprocess.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/platform/ptrace/subprocess.go b/pkg/sentry/platform/ptrace/subprocess.go index ddb1f41e3..821f6848d 100644 --- a/pkg/sentry/platform/ptrace/subprocess.go +++ b/pkg/sentry/platform/ptrace/subprocess.go @@ -21,6 +21,7 @@ import ( "sync" "syscall" + "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/log" "gvisor.dev/gvisor/pkg/procid" "gvisor.dev/gvisor/pkg/sentry/arch" @@ -541,14 +542,14 @@ func (s *subprocess) switchToApp(c *context, ac arch.Context) bool { if isSingleStepping(regs) { if _, _, errno := syscall.RawSyscall6( syscall.SYS_PTRACE, - syscall.PTRACE_SYSEMU_SINGLESTEP, + unix.PTRACE_SYSEMU_SINGLESTEP, uintptr(t.tid), 0, 0, 0, 0); errno != 0 { panic(fmt.Sprintf("ptrace sysemu failed: %v", errno)) } } else { if _, _, errno := syscall.RawSyscall6( syscall.SYS_PTRACE, - syscall.PTRACE_SYSEMU, + unix.PTRACE_SYSEMU, uintptr(t.tid), 0, 0, 0, 0); errno != 0 { panic(fmt.Sprintf("ptrace sysemu failed: %v", errno)) } |