summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-06-14 02:27:51 +0000
committergVisor bot <gvisor-bot@google.com>2021-06-14 02:27:51 +0000
commit131eb876dab02998c7e5150bd13a831b6f03af2c (patch)
tree3453890561866bc90fb39af157670e0f1b44743a /pkg/sentry
parent5f0ebe52c8007470ed0e023d24932547befa4574 (diff)
parent5c9e84622305dc9fd4e9b81eeb7309b8a894f99e (diff)
Merge release-20210601.0-52-g5c9e84622 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/kernel/pipe/pipe_util.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/pipe/pipe_util.go b/pkg/sentry/kernel/pipe/pipe_util.go
index 24e467e93..3fa5d1d2f 100644
--- a/pkg/sentry/kernel/pipe/pipe_util.go
+++ b/pkg/sentry/kernel/pipe/pipe_util.go
@@ -135,7 +135,7 @@ func (p *Pipe) Ioctl(ctx context.Context, io usermem.IO, args arch.SyscallArgume
v = math.MaxInt32 // Silently truncate.
}
// Copy result to userspace.
- iocc := primitive.IOCopyContext{
+ iocc := usermem.IOCopyContext{
IO: io,
Ctx: ctx,
Opts: usermem.IOOpts{