summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs/host
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-11 20:38:26 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-11 20:38:26 +0000
commit51194daa8da2bee362c9ecb6491016038e5f8436 (patch)
treeaa1d6310ea8b331f6985e01ae8d60b722a3e9972 /pkg/sentry/fs/host
parentb758e31a9b2f0f68d0c0182a74da954f81053f72 (diff)
parentb8bee78d0c99a0c9423061b3dda10b9ef8c9719d (diff)
Merge release-20200810.0-236-gb8bee78d0 (automated)
Diffstat (limited to 'pkg/sentry/fs/host')
-rw-r--r--pkg/sentry/fs/host/socket_unsafe.go4
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 c8231e0aa..5d4f312cf 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, nil
+ return length, n, msg.Controllen, controlTrunc, err
}
- return n, n, msg.Controllen, controlTrunc, nil
+ return n, n, msg.Controllen, controlTrunc, err
}
// fdWriteVec sends from bufs to fd.