summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/pipe
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-05-16 03:10:09 +0000
committergVisor bot <gvisor-bot@google.com>2020-05-16 03:10:09 +0000
commitc91c8fb48be452a8b40b3ef406bd8b0022359399 (patch)
treeaf7d6820964c8f8fa680e5acbffebabb0c35c471 /pkg/sentry/kernel/pipe
parent314aa01198a8aa1ceefde004b7ec4fbf86bdedc5 (diff)
parent420b791a3d6e0e6e2fc30c6f8be013bce7ca6549 (diff)
Merge release-20200511.0-251-g420b791 (automated)
Diffstat (limited to 'pkg/sentry/kernel/pipe')
-rwxr-xr-xpkg/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 5a1d4fd57..aacf28da2 100755
--- a/pkg/sentry/kernel/pipe/pipe_util.go
+++ b/pkg/sentry/kernel/pipe/pipe_util.go
@@ -144,7 +144,7 @@ func (p *Pipe) Ioctl(ctx context.Context, io usermem.IO, args arch.SyscallArgume
if v > math.MaxInt32 {
v = math.MaxInt32 // Silently truncate.
}
- // Copy result to user-space.
+ // Copy result to userspace.
_, err := usermem.CopyObjectOut(ctx, io, args[2].Pointer(), int32(v), usermem.IOOpts{
AddressSpaceActive: true,
})