diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-14 16:59:16 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-14 16:59:16 +0000 |
| commit | e7a68d4af9b37a30307c3ff1352afacf403439b6 (patch) | |
| tree | d8d6a50b3a688e35360c74edb4bb419e22db0c50 /pkg/sentry/socket/unix/unix.go | |
| parent | 3329a497f21ee98ab85f000908ed6bb99e189ffc (diff) | |
| parent | fc1e653973c97a857582b8f3651399673343589a (diff) | |
Merge release-20200928.0-116-gfc1e65397 (automated)
Diffstat (limited to 'pkg/sentry/socket/unix/unix.go')
| -rw-r--r-- | pkg/sentry/socket/unix/unix.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/sentry/socket/unix/unix.go b/pkg/sentry/socket/unix/unix.go index f80011ce4..a4a76d0a3 100644 --- a/pkg/sentry/socket/unix/unix.go +++ b/pkg/sentry/socket/unix/unix.go @@ -573,13 +573,17 @@ func (s *SocketOperations) Read(ctx context.Context, _ *fs.File, dst usermem.IOS if dst.NumBytes() == 0 { return 0, nil } - return dst.CopyOutFrom(ctx, &EndpointReader{ + r := &EndpointReader{ Ctx: ctx, Endpoint: s.ep, NumRights: 0, Peek: false, From: nil, - }) + } + n, err := dst.CopyOutFrom(ctx, r) + // Drop control messages. + r.Control.Release(ctx) + return n, err } // RecvMsg implements the linux syscall recvmsg(2) for sockets backed by |