diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-11 23:52:14 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-11 23:52:14 +0000 |
| commit | 0c23d4f03bfe755f2aecb29e1b3e8740507b320b (patch) | |
| tree | 65ef963ad81396043932dd63419f04cdf5db3ea6 /pkg/sentry/fsimpl/host | |
| parent | 2c7d03d2378865ee92d7ae24e48748f17233e783 (diff) | |
| parent | 8d0f76dda8df42f1701e6d82347ecf69b6271a13 (diff) | |
Merge release-20200810.0-237-g8d0f76dda (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/host')
| -rw-r--r-- | pkg/sentry/fsimpl/host/connected_endpoint_refs.go | 5 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/host/inode_refs.go | 5 | ||||
| -rw-r--r-- | pkg/sentry/fsimpl/host/socket_unsafe.go | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pkg/sentry/fsimpl/host/connected_endpoint_refs.go b/pkg/sentry/fsimpl/host/connected_endpoint_refs.go index 225f59782..abf4a9082 100644 --- a/pkg/sentry/fsimpl/host/connected_endpoint_refs.go +++ b/pkg/sentry/fsimpl/host/connected_endpoint_refs.go @@ -1,11 +1,12 @@ package host import ( + "runtime" + "sync/atomic" + "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "runtime" - "sync/atomic" ) // 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 4075eae17..75b9f49e2 100644 --- a/pkg/sentry/fsimpl/host/inode_refs.go +++ b/pkg/sentry/fsimpl/host/inode_refs.go @@ -1,11 +1,12 @@ package host import ( + "runtime" + "sync/atomic" + "fmt" "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" - "runtime" - "sync/atomic" ) // 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. |