summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJonathan Nobels <jnobels@gmail.com>2025-09-03 15:35:05 -0400
committerGitHub <noreply@github.com>2025-09-03 15:35:05 -0400
commita2f2ac6ba15283dcf0a6e8a62d64cf4122ea9360 (patch)
tree10b84c8a6869ef579f345788b6db316181b53580
parent2b9d055101a0a2731af9ef5d2caf513bfb7da75e (diff)
downloadtailscale-a2f2ac6ba15283dcf0a6e8a62d64cf4122ea9360.tar.xz
tailscale-a2f2ac6ba15283dcf0a6e8a62d64cf4122ea9360.zip
ipn/local: fix deadlock in initial suggested exit node query (#17025)
updates tailscale/corp#26369 b.mu is locked here. We need to use suggestExitNodeLocked. Signed-off-by: Jonathan Nobels <jonathan@tailscale.com>
-rw-r--r--ipn/ipnlocal/local.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go
index 700e2de37..7592e9b4b 100644
--- a/ipn/ipnlocal/local.go
+++ b/ipn/ipnlocal/local.go
@@ -3141,7 +3141,7 @@ func (b *LocalBackend) WatchNotificationsAs(ctx context.Context, actor ipnauth.A
ini.Health = b.HealthTracker().CurrentState()
}
if mask&ipn.NotifyInitialSuggestedExitNode != 0 {
- if en, err := b.SuggestExitNode(); err != nil {
+ if en, err := b.suggestExitNodeLocked(); err == nil {
ini.SuggestedExitNode = &en.ID
}
}