diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-11-04 19:16:23 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-11-04 19:16:23 +0000 |
| commit | c884dcb8316a261f2af70fd3fbb966b3eab1bfbe (patch) | |
| tree | d6efd9f683e6ab7aa60d6ff23d707b30c6790a90 /pkg/sentry/socket/netstack/netstack_vfs2.go | |
| parent | 2de3450f76d675ccbf7617745364893ead475a35 (diff) | |
| parent | 23a115dae84e7e63c8785c49dfff3e551a0bf97e (diff) | |
Merge release-20211026.0-33-g23a115dae (automated)
Diffstat (limited to 'pkg/sentry/socket/netstack/netstack_vfs2.go')
| -rw-r--r-- | pkg/sentry/socket/netstack/netstack_vfs2.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/socket/netstack/netstack_vfs2.go b/pkg/sentry/socket/netstack/netstack_vfs2.go index 3cdf29b80..ff10e159e 100644 --- a/pkg/sentry/socket/netstack/netstack_vfs2.go +++ b/pkg/sentry/socket/netstack/netstack_vfs2.go @@ -134,7 +134,7 @@ func (s *SocketVFS2) Write(ctx context.Context, src usermem.IOSequence, opts vfs return 0, linuxerr.ErrWouldBlock } if err != nil { - return 0, syserr.TranslateNetstackError(err).ToError() + return 0, tcpip.TranslateNetstackError(err).ToError() } if n < src.NumBytes() { @@ -155,7 +155,7 @@ func (s *SocketVFS2) Accept(t *kernel.Task, peerRequested bool, flags int, block ep, wq, terr := s.Endpoint.Accept(peerAddr) if terr != nil { if _, ok := terr.(*tcpip.ErrWouldBlock); !ok || !blocking { - return 0, nil, 0, syserr.TranslateNetstackError(terr) + return 0, nil, 0, tcpip.TranslateNetstackError(terr) } var err *syserr.Error |