diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-12 02:33:01 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-12 02:33:01 +0000 |
| commit | 19b473c6e2fe412c0e96c8b9e4672922da19471a (patch) | |
| tree | ddde3b42b8fc758bada297c9a0f0159a2fd3310a /pkg/sentry/syscalls | |
| parent | e72785486d73a34acd7afa3739da17e051690152 (diff) | |
| parent | df110ad4fe571721a7eb4a5a1f9ce92584ef7809 (diff) | |
Merge df110ad4 (automated)
Diffstat (limited to 'pkg/sentry/syscalls')
| -rw-r--r-- | pkg/sentry/syscalls/linux/error.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/syscalls/linux/error.go b/pkg/sentry/syscalls/linux/error.go index 1ba3695fb..72146ea63 100644 --- a/pkg/sentry/syscalls/linux/error.go +++ b/pkg/sentry/syscalls/linux/error.go @@ -92,6 +92,10 @@ func handleIOError(t *kernel.Task, partialResult bool, err, intr error, op strin // TODO(gvisor.dev/issue/161): In some cases SIGPIPE should // also be sent to the application. return nil + case syserror.ECONNRESET: + // For TCP sendfile connections, we may have a reset. But we + // should just return n as the result. + return nil case syserror.ErrWouldBlock: // Syscall would block, but completed a partial read/write. // This case should only be returned by IssueIO for nonblocking |