diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-01-27 02:19:18 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-27 02:19:18 +0000 |
| commit | 14ee229ad6f1eb8c465dab899ffe4ba8a903c63f (patch) | |
| tree | 6dd19bbc90c3fe64843673b889c1fdaa39720a06 /pkg/sentry/socket/netstack | |
| parent | 361ef9f80f978727027a2a8d7c4ccc32a8536bd1 (diff) | |
| parent | 8e660447410117edd49f41f7aa758e49254ae2d5 (diff) | |
Merge release-20210112.0-98-g8e6604474 (automated)
Diffstat (limited to 'pkg/sentry/socket/netstack')
| -rw-r--r-- | pkg/sentry/socket/netstack/netstack.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go index b4d0651b8..7065a0e46 100644 --- a/pkg/sentry/socket/netstack/netstack.go +++ b/pkg/sentry/socket/netstack/netstack.go @@ -1615,20 +1615,15 @@ func setSockOptSocket(t *kernel.Task, s socket.SocketOps, ep commonEndpoint, nam return syserr.ErrInvalidArgument } - family, skType, skProto := s.Type() + family, _, _ := s.Type() // TODO(gvisor.dev/issue/5132): We currently do not support // setting this option for unix sockets. if family == linux.AF_UNIX { return nil } - getBufferLimits := tcpip.GetStackSendBufferLimits - if isTCPSocket(skType, skProto) { - getBufferLimits = tcp.GetTCPSendBufferLimits - } - v := usermem.ByteOrder.Uint32(optVal) - ep.SocketOptions().SetSendBufferSize(int64(v), true, getBufferLimits) + ep.SocketOptions().SetSendBufferSize(int64(v), true) return nil case linux.SO_RCVBUF: |