diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-14 01:48:32 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-14 01:48:32 +0000 |
| commit | 58aedc71d875019d345efc73e3ea42327e71fbf9 (patch) | |
| tree | c71d4648af932990630151785bc205627c52dfa8 /pkg/sentry/socket/epsocket/epsocket.go | |
| parent | dacee8d694b063ece50e6b3cc5f227dcc1c2f2e9 (diff) | |
| parent | 3e9b8ecbfe21ba6c8c788be469fc6cea6a4a40b7 (diff) | |
Merge 3e9b8ecb (automated)
Diffstat (limited to 'pkg/sentry/socket/epsocket/epsocket.go')
| -rw-r--r-- | pkg/sentry/socket/epsocket/epsocket.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkg/sentry/socket/epsocket/epsocket.go b/pkg/sentry/socket/epsocket/epsocket.go index 8b783ae2f..ce3b247d0 100644 --- a/pkg/sentry/socket/epsocket/epsocket.go +++ b/pkg/sentry/socket/epsocket/epsocket.go @@ -668,12 +668,6 @@ func GetSockOpt(t *kernel.Task, s socket.Socket, ep commonEndpoint, family int, func getSockOptSocket(t *kernel.Task, s socket.Socket, ep commonEndpoint, family int, skType linux.SockType, name, outLen int) (interface{}, *syserr.Error) { // TODO(b/124056281): Stop rejecting short optLen values in getsockopt. switch name { - case linux.SO_TYPE: - if outLen < sizeOfInt32 { - return nil, syserr.ErrInvalidArgument - } - return int32(skType), nil - case linux.SO_ERROR: if outLen < sizeOfInt32 { return nil, syserr.ErrInvalidArgument |