TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: fix crash introduced in recent cleanups

Browse Source 
Fixes #2801

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-09-08 08:12:29 -07:00 committed by Brad Fitzpatrick
parent 640134421e
commit 2238814b99
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wgengine/magicsock/magicsock.go
View File

@ -189,9 +189,14 @@ func (m *peerMap) deleteDiscoEndpoint(ep *endpoint) {
return return
} }
ep.stopAndReset() ep.stopAndReset()
pi := m.byDiscoKey[ep.discoKey] pi := m.byNodeKey[ep.publicKey]
delete(m.byDiscoKey, ep.discoKey) delete(m.byDiscoKey, ep.discoKey)
delete(m.byNodeKey, ep.publicKey) delete(m.byNodeKey, ep.publicKey)
if pi == nil {
// Kneejerk paranoia from earlier issue 2801.
// Unexpected. But no logger plumbed here to log so.
return
}
for ip := range pi.ipPorts { for ip := range pi.ipPorts {
delete(m.byIPPort, ip) delete(m.byIPPort, ip)
} }