summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/socket/unix
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-25 17:07:08 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-25 17:07:08 +0000
commit993cd0c9e6b58c8c28ccb25a9f445e50c7d4dfaa (patch)
tree4fcbd8eee097d7c5fc7a13447bc89f640ba5ecf3 /pkg/sentry/socket/unix
parentf839b715ebad539a0d4604caa62610624ff4d166 (diff)
parentb26f7503b545e106ea0934d2153aed54ee4374d3 (diff)
Merge release-20200818.0-42-gb26f7503b (automated)
Diffstat (limited to 'pkg/sentry/socket/unix')
-rw-r--r--pkg/sentry/socket/unix/transport/unix.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/unix/transport/unix.go b/pkg/sentry/socket/unix/transport/unix.go
index 475d7177e..ab7bab5cd 100644
--- a/pkg/sentry/socket/unix/transport/unix.go
+++ b/pkg/sentry/socket/unix/transport/unix.go
@@ -942,7 +942,7 @@ func (e *baseEndpoint) GetSockOptInt(opt tcpip.SockOptInt) (int, *tcpip.Error) {
// GetSockOpt implements tcpip.Endpoint.GetSockOpt.
func (e *baseEndpoint) GetSockOpt(opt interface{}) *tcpip.Error {
switch opt.(type) {
- case tcpip.ErrorOption:
+ case tcpip.ErrorOption, *tcpip.LingerOption:
return nil
default: