summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-11-05 06:50:02 +0000
committergVisor bot <gvisor-bot@google.com>2020-11-05 06:50:02 +0000
commitab9a79fe812aee12e2b07f618727e6543e781be6 (patch)
tree4f7093aebfddfc7b9c463a5d453261e1aeaa896c
parente768bc2aa390a9dd3d4a5df3e37d3ef4249ebc51 (diff)
parent771e9ce8e18021fc8015c77c67e57f66ff93ea10 (diff)
Merge release-20201030.0-29-g771e9ce8e (automated)
-rw-r--r--pkg/tcpip/transport/tcp/connect.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/tcpip/transport/tcp/connect.go b/pkg/tcpip/transport/tcp/connect.go
index f5f7be195..c890e2326 100644
--- a/pkg/tcpip/transport/tcp/connect.go
+++ b/pkg/tcpip/transport/tcp/connect.go
@@ -1370,7 +1370,9 @@ func (e *endpoint) protocolMainLoop(handshake bool, wakerInitDone chan<- struct{
drained := e.drainDone != nil
if drained {
close(e.drainDone)
+ e.mu.Unlock()
<-e.undrain
+ e.mu.Lock()
}
// Set up the functions that will be called when the main protocol loop