diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-23 23:10:06 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-23 23:10:06 +0000 |
| commit | 1d40e8e63933e896e25c0503c22c0bd9ee240273 (patch) | |
| tree | b02e741e8d84fb054fde4955e95ccd54a80f259a /pkg/sentry/socket | |
| parent | c35e15907498fd4872381e27cbb93268e1259756 (diff) | |
| parent | 369cf38bd7186da97e134538cd4839a8a4d1aa2c (diff) | |
Merge release-20200219.0-218-g369cf38 (automated)
Diffstat (limited to 'pkg/sentry/socket')
| -rwxr-xr-x | pkg/sentry/socket/netstack/netstack.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go index a6ef7a47e..c19f5639b 100755 --- a/pkg/sentry/socket/netstack/netstack.go +++ b/pkg/sentry/socket/netstack/netstack.go @@ -2382,9 +2382,9 @@ func (s *SocketOperations) nonBlockingRead(ctx context.Context, dst usermem.IOSe // caller-supplied buffer. s.readMu.Lock() n, err := s.coalescingRead(ctx, dst, trunc) - s.readMu.Unlock() cmsg := s.controlMessages() s.fillCmsgInq(&cmsg) + s.readMu.Unlock() return n, 0, nil, 0, cmsg, err } |