diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-24 20:51:51 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-24 20:51:51 +0000 |
| commit | 017f008592692843a5f079f330b77f47077cc1a5 (patch) | |
| tree | 52d5d04e89cdbf909ac4d723fd7cea094503ee60 /pkg/sentry/syscalls/linux | |
| parent | f66db7bcc6eb1e2c6272c9859291b0c089ca7e03 (diff) | |
| parent | f13f26d17da56d585fd9857a81175bbd0be8ce60 (diff) | |
Merge release-20200323.0-239-gf13f26d (automated)
Diffstat (limited to 'pkg/sentry/syscalls/linux')
| -rwxr-xr-x | pkg/sentry/syscalls/linux/vfs2/socket.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/syscalls/linux/vfs2/socket.go b/pkg/sentry/syscalls/linux/vfs2/socket.go index b1ede32f0..10b668477 100755 --- a/pkg/sentry/syscalls/linux/vfs2/socket.go +++ b/pkg/sentry/syscalls/linux/vfs2/socket.go @@ -804,7 +804,7 @@ func recvSingleMsg(t *kernel.Task, s socket.SocketVFS2, msgPtr usermem.Addr, fla } if cms.Unix.Rights != nil { - controlData, mflags = control.PackRights(t, cms.Unix.Rights.(control.SCMRights), flags&linux.MSG_CMSG_CLOEXEC != 0, controlData, mflags) + controlData, mflags = control.PackRightsVFS2(t, cms.Unix.Rights.(control.SCMRightsVFS2), flags&linux.MSG_CMSG_CLOEXEC != 0, controlData, mflags) } // Copy the address to the caller. |