diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-27 19:53:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-27 19:53:20 +0000 |
| commit | 58a5421792fd2bf90232e5789b0525daac360610 (patch) | |
| tree | 39599eab4c714dd7ab1213c7c6344a1e342bd0d1 /pkg/sentry/socket/netstack/netstack.go | |
| parent | 15674fe2fe1c1594f5677345ab306192aeedbb15 (diff) | |
| parent | dc81eb9c37873e391a927a6f6810239565a91732 (diff) | |
Merge release-20200818.0-69-gdc81eb9c3 (automated)
Diffstat (limited to 'pkg/sentry/socket/netstack/netstack.go')
| -rw-r--r-- | pkg/sentry/socket/netstack/netstack.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go index 2af2d8252..8da77cc68 100644 --- a/pkg/sentry/socket/netstack/netstack.go +++ b/pkg/sentry/socket/netstack/netstack.go @@ -257,6 +257,9 @@ type commonEndpoint interface { // GetSockOptInt implements tcpip.Endpoint.GetSockOptInt and // transport.Endpoint.GetSockOpt. GetSockOptInt(opt tcpip.SockOptInt) (int, *tcpip.Error) + + // LastError implements tcpip.Endpoint.LastError. + LastError() *tcpip.Error } // LINT.IfChange @@ -1030,7 +1033,7 @@ func getSockOptSocket(t *kernel.Task, s socket.SocketOps, ep commonEndpoint, fam } // Get the last error and convert it. - err := ep.GetSockOpt(tcpip.ErrorOption{}) + err := ep.LastError() if err == nil { optP := primitive.Int32(0) return &optP, nil |