diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-01-05 22:56:51 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-05 22:56:51 +0000 |
| commit | 5ef7d943c0f4a09703414430a2fa282b0a49c53b (patch) | |
| tree | cfbba628ca320a19b5f4c0c8e9af560d2f0929c8 /pkg/sentry/syscalls/linux | |
| parent | ba74ccdec1f21b071355a4768d5fc0d5b036d33e (diff) | |
| parent | ce7a4440cae8ee4b2a41808f967c9847cafd2937 (diff) | |
Merge release-20201208.0-110-gce7a4440c (automated)
Diffstat (limited to 'pkg/sentry/syscalls/linux')
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_socket.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/syscalls/linux/vfs2/socket.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_socket.go b/pkg/sentry/syscalls/linux/sys_socket.go index 4adfa6637..fe45225c1 100644 --- a/pkg/sentry/syscalls/linux/sys_socket.go +++ b/pkg/sentry/syscalls/linux/sys_socket.go @@ -1030,7 +1030,7 @@ func sendSingleMsg(t *kernel.Task, s socket.Socket, file *fs.File, msgPtr userme return 0, err } - controlMessages, err := control.Parse(t, s, controlData) + controlMessages, err := control.Parse(t, s, controlData, t.Arch().Width()) if err != nil { return 0, err } diff --git a/pkg/sentry/syscalls/linux/vfs2/socket.go b/pkg/sentry/syscalls/linux/vfs2/socket.go index 987012acc..f5795b4a8 100644 --- a/pkg/sentry/syscalls/linux/vfs2/socket.go +++ b/pkg/sentry/syscalls/linux/vfs2/socket.go @@ -1033,7 +1033,7 @@ func sendSingleMsg(t *kernel.Task, s socket.SocketVFS2, file *vfs.FileDescriptio return 0, err } - controlMessages, err := control.Parse(t, s, controlData) + controlMessages, err := control.Parse(t, s, controlData, t.Arch().Width()) if err != nil { return 0, err } |