diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-30 01:11:13 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-30 01:11:13 +0000 |
| commit | 09cba788b0e19d207dc447372d9cc63eb192d09c (patch) | |
| tree | 21991c1a80571cf5c1de7c0dc4a29041dc3c9788 /pkg/sentry/kernel/pipe | |
| parent | eac775f807932304413ea34856babd8bc503a54b (diff) | |
| parent | 387501219e87701a6adeb8417542927ee39b9950 (diff) | |
Merge release-20200921.0-74-g387501219 (automated)
Diffstat (limited to 'pkg/sentry/kernel/pipe')
| -rw-r--r-- | pkg/sentry/kernel/pipe/pipe_util.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkg/sentry/kernel/pipe/pipe_util.go b/pkg/sentry/kernel/pipe/pipe_util.go index 6d58b682f..f665920cb 100644 --- a/pkg/sentry/kernel/pipe/pipe_util.go +++ b/pkg/sentry/kernel/pipe/pipe_util.go @@ -23,6 +23,7 @@ import ( "gvisor.dev/gvisor/pkg/amutex" "gvisor.dev/gvisor/pkg/buffer" "gvisor.dev/gvisor/pkg/context" + "gvisor.dev/gvisor/pkg/marshal/primitive" "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/usermem" @@ -145,9 +146,14 @@ func (p *Pipe) Ioctl(ctx context.Context, io usermem.IO, args arch.SyscallArgume v = math.MaxInt32 // Silently truncate. } // Copy result to userspace. - _, err := usermem.CopyObjectOut(ctx, io, args[2].Pointer(), int32(v), usermem.IOOpts{ - AddressSpaceActive: true, - }) + iocc := primitive.IOCopyContext{ + IO: io, + Ctx: ctx, + Opts: usermem.IOOpts{ + AddressSpaceActive: true, + }, + } + _, err := primitive.CopyInt32Out(&iocc, args[2].Pointer(), int32(v)) return 0, err default: return 0, syscall.ENOTTY |