diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-27 17:51:40 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-27 17:51:40 +0000 |
| commit | 84452958e1397b337a806f815e07ae69c4f4c896 (patch) | |
| tree | 138422671bc14bd0c66f83c31be1a991888f3359 /pkg/sentry/socket/hostinet | |
| parent | bae1520437ecbd3dd217880cb51eb24b59d26f51 (diff) | |
| parent | 0bc022b7f3c13bb7c5c8d47d1781820161e7b1ad (diff) | |
Merge release-20200518.0-45-g0bc022b7 (automated)
Diffstat (limited to 'pkg/sentry/socket/hostinet')
| -rw-r--r--[-rwxr-xr-x] | pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | pkg/sentry/socket/hostinet/hostinet_state_autogen.go | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | pkg/sentry/socket/hostinet/hostinet_unsafe_state_autogen.go | 0 | ||||
| -rw-r--r-- | pkg/sentry/socket/hostinet/socket.go | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | pkg/sentry/socket/hostinet/socket_vfs2.go | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | pkg/sentry/socket/hostinet/sockopt_impl.go | 0 |
6 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go b/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go index b0a59ba93..b0a59ba93 100755..100644 --- a/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go +++ b/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go diff --git a/pkg/sentry/socket/hostinet/hostinet_state_autogen.go b/pkg/sentry/socket/hostinet/hostinet_state_autogen.go index 333811074..333811074 100755..100644 --- a/pkg/sentry/socket/hostinet/hostinet_state_autogen.go +++ b/pkg/sentry/socket/hostinet/hostinet_state_autogen.go diff --git a/pkg/sentry/socket/hostinet/hostinet_unsafe_state_autogen.go b/pkg/sentry/socket/hostinet/hostinet_unsafe_state_autogen.go index b0a59ba93..b0a59ba93 100755..100644 --- a/pkg/sentry/socket/hostinet/hostinet_unsafe_state_autogen.go +++ b/pkg/sentry/socket/hostinet/hostinet_unsafe_state_autogen.go diff --git a/pkg/sentry/socket/hostinet/socket.go b/pkg/sentry/socket/hostinet/socket.go index b49433326..c11e82c10 100644 --- a/pkg/sentry/socket/hostinet/socket.go +++ b/pkg/sentry/socket/hostinet/socket.go @@ -555,7 +555,7 @@ func (s *socketOpsCommon) SendMsg(t *kernel.Task, src usermem.IOSequence, to []b if uint64(src.NumBytes()) != srcs.NumBytes() { return 0, nil } - if srcs.IsEmpty() { + if srcs.IsEmpty() && len(controlBuf) == 0 { return 0, nil } diff --git a/pkg/sentry/socket/hostinet/socket_vfs2.go b/pkg/sentry/socket/hostinet/socket_vfs2.go index 677743113..677743113 100755..100644 --- a/pkg/sentry/socket/hostinet/socket_vfs2.go +++ b/pkg/sentry/socket/hostinet/socket_vfs2.go diff --git a/pkg/sentry/socket/hostinet/sockopt_impl.go b/pkg/sentry/socket/hostinet/sockopt_impl.go index 8a783712e..8a783712e 100755..100644 --- a/pkg/sentry/socket/hostinet/sockopt_impl.go +++ b/pkg/sentry/socket/hostinet/sockopt_impl.go |