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/fs | |
| parent | 2de3450f76d675ccbf7617745364893ead475a35 (diff) | |
| parent | 23a115dae84e7e63c8785c49dfff3e551a0bf97e (diff) | |
Merge release-20211026.0-33-g23a115dae (automated)
Diffstat (limited to 'pkg/sentry/fs')
| -rw-r--r-- | pkg/sentry/fs/gofer/socket.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/fs/host/socket.go | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkg/sentry/fs/gofer/socket.go b/pkg/sentry/fs/gofer/socket.go index 1fd8a0910..17932bf1a 100644 --- a/pkg/sentry/fs/gofer/socket.go +++ b/pkg/sentry/fs/gofer/socket.go @@ -23,6 +23,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fs/host" "gvisor.dev/gvisor/pkg/sentry/socket/unix/transport" "gvisor.dev/gvisor/pkg/syserr" + "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/waiter" ) @@ -95,7 +96,7 @@ func (e *endpoint) BidirectionalConnect(ctx context.Context, ce transport.Connec } if ce.Listening() { ce.Unlock() - return syserr.ErrInvalidEndpointState + return tcpip.SyserrInvalidEndpointState } hostFile, err := e.file.Connect(cf) diff --git a/pkg/sentry/fs/host/socket.go b/pkg/sentry/fs/host/socket.go index 54c421775..17ee77af4 100644 --- a/pkg/sentry/fs/host/socket.go +++ b/pkg/sentry/fs/host/socket.go @@ -82,7 +82,7 @@ func (c *ConnectedEndpoint) init() *syserr.Error { if family != unix.AF_UNIX { // We only allow Unix sockets. - return syserr.ErrInvalidEndpointState + return tcpip.SyserrInvalidEndpointState } stype, err := unix.GetsockoptInt(c.file.FD(), unix.SOL_SOCKET, unix.SO_TYPE) @@ -200,7 +200,7 @@ func (c *ConnectedEndpoint) Send(ctx context.Context, data [][]byte, controlMess defer c.mu.RUnlock() if !controlMessages.Empty() { - return 0, false, syserr.ErrInvalidEndpointState + return 0, false, tcpip.SyserrInvalidEndpointState } // Since stream sockets don't preserve message boundaries, we can write |