diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-11-25 11:01:22 -0800 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-11-25 11:01:22 -0800 |
commit | 0416c247eca8dfe455b4972b11ef8aab0ea41d0f (patch) | |
tree | 7ee90568f10953976fab398362398b761a76dab1 /pkg | |
parent | 1641338b14204ea941c547cf4c1a70665922ca05 (diff) | |
parent | 05871a1cdc73e98df58f56841be23a4eac27225c (diff) |
Merge pull request #1176 from xiaobo55x:runsc_boot
PiperOrigin-RevId: 282382564
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/seccomp/seccomp_test_victim.go | 2 | ||||
-rw-r--r-- | pkg/sentry/fs/gofer/inode.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/seccomp/seccomp_test_victim.go b/pkg/seccomp/seccomp_test_victim.go index 48413f1fb..da6b9eaaf 100644 --- a/pkg/seccomp/seccomp_test_victim.go +++ b/pkg/seccomp/seccomp_test_victim.go @@ -38,7 +38,7 @@ func main() { syscall.SYS_CLONE: {}, syscall.SYS_CLOSE: {}, syscall.SYS_DUP: {}, - syscall.SYS_DUP2: {}, + syscall.SYS_DUP3: {}, syscall.SYS_EPOLL_CREATE1: {}, syscall.SYS_EPOLL_CTL: {}, syscall.SYS_EPOLL_WAIT: {}, diff --git a/pkg/sentry/fs/gofer/inode.go b/pkg/sentry/fs/gofer/inode.go index 4237bf353..91263ebdc 100644 --- a/pkg/sentry/fs/gofer/inode.go +++ b/pkg/sentry/fs/gofer/inode.go @@ -274,7 +274,7 @@ func (i *inodeFileState) recreateReadHandles(ctx context.Context, writer *handle // operations on the old will see the new data. Then, make the new handle take // ownereship of the old FD and mark the old readHandle to not close the FD // when done. - if err := syscall.Dup2(h.Host.FD(), i.readHandles.Host.FD()); err != nil { + if err := syscall.Dup3(h.Host.FD(), i.readHandles.Host.FD(), 0); err != nil { return err } |