diff options
| author | Kevin Krakauer <krakauer@google.com> | 2021-01-05 14:43:35 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-05 14:45:47 -0800 |
| commit | ce7a4440cae8ee4b2a41808f967c9847cafd2937 (patch) | |
| tree | d35184f0935260b6f06e6652bbddef1e12ba3e47 /pkg/sentry/syscalls/linux | |
| parent | b06e5bc5b0913d3740b435d8753a2569220e0a33 (diff) | |
Fix panic when parsing SO_TIMESTAMP cmsg
PiperOrigin-RevId: 350223482
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 } |