diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-10 22:55:32 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-10 22:55:32 +0000 |
| commit | 857005f70793d553203f303c834368694adc8b8f (patch) | |
| tree | 18dfd06743d104b786df6dfd9d67a059d1c7e5fa /pkg/sentry/platform/ptrace | |
| parent | 8390a8227b571e82c42e3e90aa28a7b86f7e3f9b (diff) | |
| parent | 589f36ac4ae31b1f7f35a74d982398e48c28aa31 (diff) | |
Merge 589f36ac (automated)
Diffstat (limited to 'pkg/sentry/platform/ptrace')
| -rw-r--r-- | pkg/sentry/platform/ptrace/subprocess.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ptrace/subprocess_linux.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/platform/ptrace/subprocess.go b/pkg/sentry/platform/ptrace/subprocess.go index 83b43057f..d3b196924 100644 --- a/pkg/sentry/platform/ptrace/subprocess.go +++ b/pkg/sentry/platform/ptrace/subprocess.go @@ -21,9 +21,9 @@ import ( "sync" "syscall" + "gvisor.googlesource.com/gvisor/pkg/procid" "gvisor.googlesource.com/gvisor/pkg/sentry/arch" "gvisor.googlesource.com/gvisor/pkg/sentry/platform" - "gvisor.googlesource.com/gvisor/pkg/sentry/platform/procid" "gvisor.googlesource.com/gvisor/pkg/sentry/usermem" ) diff --git a/pkg/sentry/platform/ptrace/subprocess_linux.go b/pkg/sentry/platform/ptrace/subprocess_linux.go index 2c07b4ac3..914be7486 100644 --- a/pkg/sentry/platform/ptrace/subprocess_linux.go +++ b/pkg/sentry/platform/ptrace/subprocess_linux.go @@ -22,9 +22,9 @@ import ( "gvisor.googlesource.com/gvisor/pkg/abi/linux" "gvisor.googlesource.com/gvisor/pkg/log" + "gvisor.googlesource.com/gvisor/pkg/procid" "gvisor.googlesource.com/gvisor/pkg/seccomp" "gvisor.googlesource.com/gvisor/pkg/sentry/arch" - "gvisor.googlesource.com/gvisor/pkg/sentry/platform/procid" ) const syscallEvent syscall.Signal = 0x80 @@ -142,7 +142,7 @@ func attachedThread(flags uintptr, defaultAction linux.BPFAction) (*thread, erro // down available calls only to what is needed. rules := []seccomp.RuleSet{ // Rules for trapping vsyscall access. - seccomp.RuleSet{ + { Rules: seccomp.SyscallRules{ syscall.SYS_GETTIMEOFDAY: {}, syscall.SYS_TIME: {}, |