diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-02-02 19:50:21 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-02-02 19:50:21 +0000 |
| commit | c4bddc8deecbb4d6e3e9269e321610cdf085aab7 (patch) | |
| tree | 2f7adf1ad344870beee89a12f5e47d32d60b6b04 /pkg/sentry/syscalls/linux | |
| parent | d3c73d7c024da5b2ecc8ed5a97993af594404f13 (diff) | |
| parent | d6d169320cd40d0910955debc9b0c91877b53900 (diff) | |
Merge release-20210125.0-60-gd6d169320 (automated)
Diffstat (limited to 'pkg/sentry/syscalls/linux')
| -rw-r--r-- | pkg/sentry/syscalls/linux/error.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/syscalls/linux/error.go b/pkg/sentry/syscalls/linux/error.go index dab6207c0..d1778d029 100644 --- a/pkg/sentry/syscalls/linux/error.go +++ b/pkg/sentry/syscalls/linux/error.go @@ -134,8 +134,8 @@ func handleIOErrorImpl(t *kernel.Task, partialResult bool, err, intr error, op s // Similar to EPIPE. Return what we wrote this time, and let // ENOSPC be returned on the next call. return true, nil - case syserror.ECONNRESET: - // For TCP sendfile connections, we may have a reset. But we + case syserror.ECONNRESET, syserror.ETIMEDOUT: + // For TCP sendfile connections, we may have a reset or timeout. But we // should just return n as the result. return true, nil case syserror.ErrWouldBlock: |