webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

ipn/ipnlocal: fix data race on captiveCtx in enterStateLockedOnEntry (#17495)

Browse Source 
Updates #17491

Signed-off-by: James Sanderson <jsanderson@tailscale.com>
This commit is contained in:
James 'zofrex' Sanderson
2025-10-08 15:34:50 +01:00
committed by GitHub
parent 0586d5d40d
commit 2d1014ead1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipn/ipnlocal/local.go
+3 -2
View File
@@ -5573,8 +5573,9 @@ func (b *LocalBackend) enterStateLockedOnEntry(newState ipn.State, unlock unlock
// can be shut down if we transition away from Running. // can be shut down if we transition away from Running.
if buildfeatures.HasCaptivePortal { if buildfeatures.HasCaptivePortal {
if b.captiveCancel == nil { if b.captiveCancel == nil {
b.captiveCtx, b.captiveCancel = context.WithCancel(b.ctx) captiveCtx, captiveCancel := context.WithCancel(b.ctx)
b.goTracker.Go(func() { hookCheckCaptivePortalLoop.Get()(b, b.captiveCtx) }) b.captiveCtx, b.captiveCancel = captiveCtx, captiveCancel
b.goTracker.Go(func() { hookCheckCaptivePortalLoop.Get()(b, captiveCtx) })
} }
} }
} else if oldState == ipn.Running { } else if oldState == ipn.Running {