diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-22 22:57:48 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-22 22:57:48 +0000 |
| commit | c6031eb481baf57849c45c6ffde27efc89398c4c (patch) | |
| tree | 1cd27d85a44a8a5fe8f210ef3feed3e35699cb75 /pkg/sentry/fs/host/socket.go | |
| parent | d909242b0d797db387131912b51373fda7608e95 (diff) | |
| parent | e1dc1c78e7a523fc64ca28bed60a9a40ea1de46a (diff) | |
Merge release-20210614.0-14-ge1dc1c78e (automated)
Diffstat (limited to 'pkg/sentry/fs/host/socket.go')
| -rw-r--r-- | pkg/sentry/fs/host/socket.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/fs/host/socket.go b/pkg/sentry/fs/host/socket.go index 46a2dc47d..225244868 100644 --- a/pkg/sentry/fs/host/socket.go +++ b/pkg/sentry/fs/host/socket.go @@ -21,6 +21,7 @@ import ( "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/context" + "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/fd" "gvisor.dev/gvisor/pkg/fdnotifier" "gvisor.dev/gvisor/pkg/refs" @@ -213,7 +214,7 @@ func (c *ConnectedEndpoint) Send(ctx context.Context, data [][]byte, controlMess // block (and only for stream sockets). err = syserror.EAGAIN } - if n > 0 && err != syserror.EAGAIN { + if n > 0 && !linuxerr.Equals(linuxerr.EAGAIN, err) { // The caller may need to block to send more data, but // otherwise there isn't anything that can be done about an // error with a partial write. |