diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-18 03:03:37 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-18 03:03:37 +0000 |
| commit | e6486141a9b379f06e841b86d867ef4f09421d3a (patch) | |
| tree | 5be402dc35fdf8360f474172afa6f4cbd4fa0106 /pkg/sentry/socket/netstack | |
| parent | e6af9699c8065e6f9f578bdf0213853dcbe07bbd (diff) | |
| parent | d34bda027309695e3e6fb6f92a5839cd1f21173e (diff) | |
Merge release-20200907.0-134-gd34bda027 (automated)
Diffstat (limited to 'pkg/sentry/socket/netstack')
| -rw-r--r-- | pkg/sentry/socket/netstack/netstack.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go index 33edb1b6f..816c89cfa 100644 --- a/pkg/sentry/socket/netstack/netstack.go +++ b/pkg/sentry/socket/netstack/netstack.go @@ -1185,7 +1185,7 @@ func getSockOptSocket(t *kernel.Task, s socket.SocketOps, ep commonEndpoint, fam var v tcpip.LingerOption var linger linux.Linger if err := ep.GetSockOpt(&v); err != nil { - return &linger, nil + return nil, syserr.TranslateNetstackError(err) } if v.Enabled { |