diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-02-06 06:49:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-02-06 06:49:12 +0000 |
| commit | 971856a97882eee6fc216b12e8e20bba0f14c231 (patch) | |
| tree | 9a71fe33a8c62ffd2bfa29bc27d59722b9412f60 /pkg/tcpip/transport/tcp | |
| parent | b3a9b1da3837ba2636e621467bb56aad942caf5c (diff) | |
| parent | 1b6a12a768216a99a5e0428c42ea4faf79cf3b50 (diff) | |
Merge release-20200127.0-85-g1b6a12a (automated)
Diffstat (limited to 'pkg/tcpip/transport/tcp')
| -rw-r--r-- | pkg/tcpip/transport/tcp/endpoint.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/tcpip/transport/tcp/endpoint.go b/pkg/tcpip/transport/tcp/endpoint.go index e4a6b1b8b..f2be0e651 100644 --- a/pkg/tcpip/transport/tcp/endpoint.go +++ b/pkg/tcpip/transport/tcp/endpoint.go @@ -2166,6 +2166,9 @@ func (e *endpoint) listen(backlog int) *tcpip.Error { e.isRegistered = true e.setEndpointState(StateListen) + // The channel may be non-nil when we're restoring the endpoint, and it + // may be pre-populated with some previously accepted (but not Accepted) + // endpoints. if e.acceptedChan == nil { e.acceptedChan = make(chan *endpoint, backlog) } |