diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-11 18:59:03 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-11 18:59:03 +0000 |
| commit | 4a40751d1128b1b7df3c8bed9c00834682d67c53 (patch) | |
| tree | 76ea94211a65ee1365f49d2b4866753ad60770f7 /pkg/sentry/fs | |
| parent | b4312fa7cc07870284ea9dfbc5bcc55cf3617ecb (diff) | |
| parent | 831ab2dd993e834933e0b23310cd616dbc0551ad (diff) | |
Merge release-20200907.0-32-g831ab2dd9 (automated)
Diffstat (limited to 'pkg/sentry/fs')
| -rw-r--r-- | pkg/sentry/fs/host/socket_unsafe.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fs/host/socket_unsafe.go b/pkg/sentry/fs/host/socket_unsafe.go index 5d4f312cf..c8231e0aa 100644 --- a/pkg/sentry/fs/host/socket_unsafe.go +++ b/pkg/sentry/fs/host/socket_unsafe.go @@ -65,10 +65,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. |