summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-06-25 01:08:29 +0000
committergVisor bot <gvisor-bot@google.com>2021-06-25 01:08:29 +0000
commitb1a2bc539b5c531fcc0e21179cc8d576261bb318 (patch)
treed34c554ee98dcdc3948105c021ec527ebf4627a0 /pkg/sentry/fs
parent8ee8bce7e0fc40c5d5dccb70bf58705547af9cd1 (diff)
parentccd2d607e5b51b0940c2c267305d7b565ba99102 (diff)
Merge release-20210614.0-27-gccd2d607e (automated)
Diffstat (limited to 'pkg/sentry/fs')
-rw-r--r--pkg/sentry/fs/host/socket_iovec.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fs/host/socket_iovec.go b/pkg/sentry/fs/host/socket_iovec.go
index 7380d75e7..fd48aff11 100644
--- a/pkg/sentry/fs/host/socket_iovec.go
+++ b/pkg/sentry/fs/host/socket_iovec.go
@@ -16,7 +16,7 @@ package host
import (
"golang.org/x/sys/unix"
- "gvisor.dev/gvisor/pkg/iovec"
+ "gvisor.dev/gvisor/pkg/sentry/hostfd"
"gvisor.dev/gvisor/pkg/syserror"
)
@@ -72,7 +72,7 @@ func buildIovec(bufs [][]byte, maxlen int64, truncate bool) (length int64, iovec
}
}
- if iovsRequired > iovec.MaxIovs {
+ if iovsRequired > hostfd.MaxSendRecvMsgIov {
// The kernel will reject our call if we pass this many iovs.
// Use a single intermediate buffer instead.
b := make([]byte, stopLen)