diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-07-18 22:49:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-07-18 22:49:12 +0000 |
| commit | 881e2e983db5d5443cf94ef90655e7f698e8961c (patch) | |
| tree | 45729e32a35e2250ac1e11c66916ee21b273b7c6 /pkg/sentry/syscalls/linux | |
| parent | 2fcf4543244a8762f35e2eced37d65e0c91b2896 (diff) | |
| parent | eefa817cfdb04ff07e7069396f21bd6ba2c89957 (diff) | |
Merge eefa817c (automated)
Diffstat (limited to 'pkg/sentry/syscalls/linux')
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_socket.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_socket.go b/pkg/sentry/syscalls/linux/sys_socket.go index 195734257..fa568a660 100644 --- a/pkg/sentry/syscalls/linux/sys_socket.go +++ b/pkg/sentry/syscalls/linux/sys_socket.go @@ -802,6 +802,11 @@ func recvSingleMsg(t *kernel.Task, s socket.Socket, msgPtr usermem.Addr, flags i controlData = control.PackTimestamp(t, cms.IP.Timestamp, controlData) } + if cms.IP.HasInq { + // In Linux, TCP_CM_INQ is added after SO_TIMESTAMP. + controlData = control.PackInq(t, cms.IP.Inq, controlData) + } + if cms.Unix.Rights != nil { controlData, mflags = control.PackRights(t, cms.Unix.Rights.(control.SCMRights), flags&linux.MSG_CMSG_CLOEXEC != 0, controlData, mflags) } |