diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-01-26 18:05:02 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-26 18:05:02 +0000 |
| commit | f612f2f0cb3b599c621ef584c87a5f6182bda9cc (patch) | |
| tree | a6ba1d556ebaa9aaf3dffef73aa2bcb00cc262bc /pkg/sentry | |
| parent | 894327c74e2cfe9ae4a3ec3ee53d5d14a7b90d3a (diff) | |
| parent | abdff887483f1d9487bffa0278dd6f7a40e59a74 (diff) | |
Merge release-20210112.0-91-gabdff8874 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/socket/unix/unix.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/socket/unix/unix.go b/pkg/sentry/socket/unix/unix.go index 6c4ec55b2..32e5d2304 100644 --- a/pkg/sentry/socket/unix/unix.go +++ b/pkg/sentry/socket/unix/unix.go @@ -496,6 +496,9 @@ func (s *socketOpsCommon) SendMsg(t *kernel.Task, src usermem.IOSequence, to []b return int(n), syserr.FromError(err) } + // Only send SCM Rights once (see net/unix/af_unix.c:unix_stream_sendmsg). + w.Control.Rights = nil + // We'll have to block. Register for notification and keep trying to // send all the data. e, ch := waiter.NewChannelEntry(nil) |