diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-04-29 16:14:57 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-04-29 16:14:57 +0000 |
| commit | 785bba198fab6be031b27966342ff144ffed283f (patch) | |
| tree | dd5dfc6de950699306afd0019261e4e5821cddbd /pkg | |
| parent | b503e7e13a336d40b2b47ad95c17f7cd743d233c (diff) | |
| parent | c03b380c2ce24999a52bb9e9d7e2c7051f11ec0e (diff) | |
Merge release-20210419.0-40-gc03b380c2 (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/sentry/strace/linux64_amd64.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/strace/linux64_arm64.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/strace/linux64_amd64.go b/pkg/sentry/strace/linux64_amd64.go index 776093de0..71b92eaee 100644 --- a/pkg/sentry/strace/linux64_amd64.go +++ b/pkg/sentry/strace/linux64_amd64.go @@ -305,7 +305,7 @@ var linuxAMD64 = SyscallMap{ 278: makeSyscallInfo("vmsplice", FD, Hex, Hex, Hex), 279: makeSyscallInfo("move_pages", Hex, Hex, Hex, Hex, Hex, Hex), 280: makeSyscallInfo("utimensat", FD, Path, UTimeTimespec, Hex), - 281: makeSyscallInfo("epoll_pwait", FD, EpollEvents, Hex, Hex, SigSet), + 281: makeSyscallInfo("epoll_pwait", FD, EpollEvents, Hex, Hex, SigSet, Hex), 282: makeSyscallInfo("signalfd", Hex, Hex, Hex), 283: makeSyscallInfo("timerfd_create", Hex, Hex), 284: makeSyscallInfo("eventfd", Hex), diff --git a/pkg/sentry/strace/linux64_arm64.go b/pkg/sentry/strace/linux64_arm64.go index 6e1383c4c..bd7361a52 100644 --- a/pkg/sentry/strace/linux64_arm64.go +++ b/pkg/sentry/strace/linux64_arm64.go @@ -46,7 +46,7 @@ var linuxARM64 = SyscallMap{ 19: makeSyscallInfo("eventfd2", Hex, Hex), 20: makeSyscallInfo("epoll_create1", Hex), 21: makeSyscallInfo("epoll_ctl", FD, EpollCtlOp, FD, EpollEvent), - 22: makeSyscallInfo("epoll_pwait", FD, EpollEvents, Hex, Hex, SigSet), + 22: makeSyscallInfo("epoll_pwait", FD, EpollEvents, Hex, Hex, SigSet, Hex), 23: makeSyscallInfo("dup", FD), 24: makeSyscallInfo("dup3", FD, FD, Hex), 25: makeSyscallInfo("fcntl", FD, Hex, Hex), |