diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-11 20:38:26 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-11 20:38:26 +0000 |
| commit | 51194daa8da2bee362c9ecb6491016038e5f8436 (patch) | |
| tree | aa1d6310ea8b331f6985e01ae8d60b722a3e9972 /pkg/sentry/fsimpl/host | |
| parent | b758e31a9b2f0f68d0c0182a74da954f81053f72 (diff) | |
| parent | b8bee78d0c99a0c9423061b3dda10b9ef8c9719d (diff) | |
Merge release-20200810.0-236-gb8bee78d0 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/host')
| -rw-r--r-- | pkg/sentry/fsimpl/host/connected_endpoint_refs.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/host/inode_refs.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/host/socket_unsafe.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkg/sentry/fsimpl/host/connected_endpoint_refs.go b/pkg/sentry/fsimpl/host/connected_endpoint_refs.go index 670166c76..babb3f664 100644 --- a/pkg/sentry/fsimpl/host/connected_endpoint_refs.go +++ b/pkg/sentry/fsimpl/host/connected_endpoint_refs.go @@ -1,12 +1,12 @@ package host import ( + "fmt" + "runtime" "sync/atomic" - "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "runtime" ) // ownerType is used to customize logging. Note that we use a pointer to T so diff --git a/pkg/sentry/fsimpl/host/inode_refs.go b/pkg/sentry/fsimpl/host/inode_refs.go index 49c57c113..17f90ce4a 100644 --- a/pkg/sentry/fsimpl/host/inode_refs.go +++ b/pkg/sentry/fsimpl/host/inode_refs.go @@ -1,12 +1,12 @@ package host import ( + "fmt" + "runtime" "sync/atomic" - "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "runtime" ) // ownerType is used to customize logging. Note that we use a pointer to T so diff --git a/pkg/sentry/fsimpl/host/socket_unsafe.go b/pkg/sentry/fsimpl/host/socket_unsafe.go index c0bf45f08..35ded24bc 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, 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. |