diff options
| author | Haibo Xu <haibo.xu@arm.com> | 2019-11-11 08:20:18 +0000 |
|---|---|---|
| committer | Haibo Xu <haibo.xu@arm.com> | 2019-11-13 06:39:11 +0000 |
| commit | 05871a1cdc73e98df58f56841be23a4eac27225c (patch) | |
| tree | 6b17ac447e4d621ace18f4eddbcae8a3f415de46 /pkg | |
| parent | 2c6c9af904c99371fe4381517375cd114917db59 (diff) | |
Enable runsc/boot support on arm64.
This patch also include a minor change to replace syscall.Dup2
with syscall.Dup3 which was missed in a previous commit(ref a25a976).
Signed-off-by: Haibo Xu <haibo.xu@arm.com>
Change-Id: I00beb9cc492e44c762ebaa3750201c63c1f7c2f3
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 99910388f..54a8ceef8 100644 --- a/pkg/sentry/fs/gofer/inode.go +++ b/pkg/sentry/fs/gofer/inode.go @@ -268,7 +268,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 } |