diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-24 02:27:03 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-24 02:27:03 +0000 |
| commit | deac03783781da2bef03bee3ca823bfb4fc885a6 (patch) | |
| tree | f3fb065dc4b72ebdbe001662826d1f0ed2d9b765 /pkg/sentry/socket/unix | |
| parent | 6dc7a97606f2d93a58ce92de3251fca1c9802c31 (diff) | |
| parent | 8dfbec28a47483e0c03a5c94331081d7219f215b (diff) | |
Merge release-20201019.0-53-g8dfbec28a (automated)
Diffstat (limited to 'pkg/sentry/socket/unix')
| -rw-r--r-- | pkg/sentry/socket/unix/transport/unix.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/unix/transport/unix.go b/pkg/sentry/socket/unix/transport/unix.go index 4b9e119a8..a7d1068a6 100644 --- a/pkg/sentry/socket/unix/transport/unix.go +++ b/pkg/sentry/socket/unix/transport/unix.go @@ -487,7 +487,7 @@ func (q *streamQueueReceiver) Recv(ctx context.Context, data [][]byte, wantCreds c := q.control.Clone() // Don't consume data since we are peeking. - copied, data, _ = vecCopy(data, q.buffer) + copied, _, _ = vecCopy(data, q.buffer) return copied, copied, c, false, q.addr, notify, nil } |