TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-28 10:18:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: fix Taildrop deadlock

Browse Source 
This fixes the Taildrop deadlock from 8b72dd787320.

Fixes #15824

Change-Id: I5ca583de20dd0d0b513ce546439dc632408ca1f1
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2025-04-30 14:42:11 -07:00 committed by Brad Fitzpatrick
parent ac04338a0d
commit c09cd34f59
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ipn/ipnlocal/local.go
View File

@ -1463,15 +1463,30 @@ func (b *LocalBackend) PeerCaps(src netip.Addr) tailcfg.PeerCapMap {
return b.currentNode().PeerCaps(src)
}
// AppendMatchingPeers returns base with all peers that match pred appended.
//
// It acquires b.mu to read the netmap but releases it before calling pred.
func (b *localNodeContext) AppendMatchingPeers(base []tailcfg.NodeView, pred func(tailcfg.NodeView) bool) []tailcfg.NodeView {
var peers []tailcfg.NodeView
b.mu.Lock()
defer b.mu.Unlock()
ret := base
if b.netMap == nil {
return ret
if b.netMap != nil {
// All fields on b.netMap are immutable, so this is
// safe to copy and use outside the lock.
peers = b.netMap.Peers
}
for _, peer := range b.netMap.Peers {
if pred(peer) {
b.mu.Unlock()
ret := base
for _, peer := range peers {
// The peers in b.netMap don't contain updates made via
// UpdateNetmapDelta. So only use PeerView in b.netMap for its NodeID,
// and then look up the latest copy in b.peers which is updated in
// response to UpdateNetmapDelta edits.
b.mu.Lock()
peer, ok := b.peers[peer.ID()]
b.mu.Unlock()
if ok && pred(peer) {
ret = append(ret, peer)
}
}