diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-11-28 00:23:20 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-11-28 00:23:20 +0000 |
commit | e93dcad543b488f8aa770a6ff7eb0b25ac3faf56 (patch) | |
tree | 71de4b074d865c13ad1f43cf254a411565f13ad9 /pkg/sentry/syscalls | |
parent | be3d0b85b9d043b1a69192bfc5e5530887c5c39c (diff) | |
parent | 684f757a228f88e5fabe6ebe6ed54f0db20fd63d (diff) |
Merge release-20191114.0-41-g684f757 (automated)
Diffstat (limited to 'pkg/sentry/syscalls')
-rw-r--r-- | pkg/sentry/syscalls/linux/sys_socket.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_socket.go b/pkg/sentry/syscalls/linux/sys_socket.go index ab1001f16..13f77565f 100644 --- a/pkg/sentry/syscalls/linux/sys_socket.go +++ b/pkg/sentry/syscalls/linux/sys_socket.go @@ -802,6 +802,14 @@ func recvSingleMsg(t *kernel.Task, s socket.Socket, msgPtr usermem.Addr, flags i controlData = control.PackInq(t, cms.IP.Inq, controlData) } + if cms.IP.HasTOS { + controlData = control.PackTOS(t, cms.IP.TOS, controlData) + } + + if cms.IP.HasTClass { + controlData = control.PackTClass(t, cms.IP.TClass, controlData) + } + if cms.Unix.Rights != nil { controlData, mflags = control.PackRights(t, cms.Unix.Rights.(control.SCMRights), flags&linux.MSG_CMSG_CLOEXEC != 0, controlData, mflags) } |