diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-12 00:45:42 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-12 00:45:42 +0000 |
| commit | adc40ebe4d52364f50701dc85a082b646541f827 (patch) | |
| tree | 38e6680ee42d264ae34167955890984c00c139b6 /pkg/sentry/fsimpl/host/socket_unsafe.go | |
| parent | 0c23d4f03bfe755f2aecb29e1b3e8740507b320b (diff) | |
| parent | 3ca73841d7ec1218cab21f7be2433f739be5d367 (diff) | |
Merge release-20200907.0-37-g3ca73841d (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/host/socket_unsafe.go')
| -rw-r--r-- | pkg/sentry/fsimpl/host/socket_unsafe.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/host/socket_unsafe.go b/pkg/sentry/fsimpl/host/socket_unsafe.go index 35ded24bc..c0bf45f08 100644 --- a/pkg/sentry/fsimpl/host/socket_unsafe.go +++ b/pkg/sentry/fsimpl/host/socket_unsafe.go @@ -63,10 +63,10 @@ func fdReadVec(fd int, bufs [][]byte, control []byte, peek bool, maxlen int64) ( controlTrunc = msg.Flags&syscall.MSG_CTRUNC == syscall.MSG_CTRUNC if n > length { - return length, n, msg.Controllen, controlTrunc, err + return length, n, msg.Controllen, controlTrunc, nil } - return n, n, msg.Controllen, controlTrunc, err + return n, n, msg.Controllen, controlTrunc, nil } // fdWriteVec sends from bufs to fd. |