lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wgengine: fix race on endpoints in getStatus 

Signed-off-by: James Tucker <james@tailscale.com>
(cherry picked from commit 265b008e49)
pull/5574/head
James Tucker 2022-09-01 10:51:44 -07:00 committed by Denton Gentry
parent bd14112d0b
commit 78584a8552
No known key found for this signature in database
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wgengine/userspace.go
View File

@ -1005,6 +1005,7 @@ func (e *userspaceEngine) getStatus() (*Status, error) {
closing := e.closing closing := e.closing
peerKeys := make([]key.NodePublic, len(e.peerSequence)) peerKeys := make([]key.NodePublic, len(e.peerSequence))
copy(peerKeys, e.peerSequence) copy(peerKeys, e.peerSequence)
localAddrs := append([]tailcfg.Endpoint(nil), e.endpoints...)
e.mu.Unlock() e.mu.Unlock()
if closing { if closing {
@ -1020,7 +1021,7 @@ func (e *userspaceEngine) getStatus() (*Status, error) {
return &Status{ return &Status{
AsOf: time.Now(), AsOf: time.Now(),
LocalAddrs: append([]tailcfg.Endpoint(nil), e.endpoints...), LocalAddrs: localAddrs,
Peers: peers, Peers: peers,
DERPs: derpConns, DERPs: derpConns,
}, nil }, nil