diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-12-02 16:42:33 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-12-02 16:42:33 +0000 |
| commit | acea88e3a6ea0fcabec8115a7d9f25ddbccc8d51 (patch) | |
| tree | 1ae365f40aa9821ea909b2d7b29455c9c83206ec /pkg/sentry/syscalls | |
| parent | a396fd95ed02af89a38361f08264a726259d5570 (diff) | |
| parent | 9194aab2aaada137b377fdfcb812a7c015857d5d (diff) | |
Merge release-20191114.0-45-g9194aab (automated)
Diffstat (limited to 'pkg/sentry/syscalls')
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_socket.go | 4 |
1 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 13f77565f..d8acae063 100644 --- a/pkg/sentry/syscalls/linux/sys_socket.go +++ b/pkg/sentry/syscalls/linux/sys_socket.go @@ -1068,10 +1068,10 @@ func sendSingleMsg(t *kernel.Task, s socket.Socket, file *fs.File, msgPtr userme } // Call the syscall implementation. - n, e := s.SendMsg(t, src, to, int(flags), haveDeadline, deadline, socket.ControlMessages{Unix: controlMessages}) + n, e := s.SendMsg(t, src, to, int(flags), haveDeadline, deadline, controlMessages) err = handleIOError(t, n != 0, e.ToError(), kernel.ERESTARTSYS, "sendmsg", file) if err != nil { - controlMessages.Release() + controlMessages.Unix.Release() } return uintptr(n), err } |