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/fsimpl/host | |
| parent | 2de3450f76d675ccbf7617745364893ead475a35 (diff) | |
| parent | 23a115dae84e7e63c8785c49dfff3e551a0bf97e (diff) | |
Merge release-20211026.0-33-g23a115dae (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/host')
| -rw-r--r-- | pkg/sentry/fsimpl/host/socket.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/host/socket.go b/pkg/sentry/fsimpl/host/socket.go index 709d5747d..9f8559d20 100644 --- a/pkg/sentry/fsimpl/host/socket.go +++ b/pkg/sentry/fsimpl/host/socket.go @@ -97,7 +97,7 @@ func (c *ConnectedEndpoint) initFromOptions() *syserr.Error { if family != unix.AF_UNIX { // We only allow Unix sockets. - return syserr.ErrInvalidEndpointState + return tcpip.SyserrInvalidEndpointState } stype, err := unix.GetsockoptInt(c.fd, unix.SOL_SOCKET, unix.SO_TYPE) @@ -147,7 +147,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 |