TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-25 10:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: make receive from didCopy respect cancellation.

Browse Source 
Very rarely, cancellation occurs between a successful send on derpRecvCh
and a call to copyBuf on the receiving side.
Without this patch, this situation results in <-copyBuf blocking indefinitely.

Signed-off-by: Dmytro Shynkevych <dmytro@tailscale.com>
This commit is contained in:
Dmytro Shynkevych 2020-07-16 10:29:43 -04:00
parent 1f923124bf
commit 891898525c
No known key found for this signature in database
GPG Key ID: FF5E2F3DAD97EA23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wgengine/magicsock/magicsock.go
View File

@ -1160,7 +1160,15 @@ func (c *Conn) runDerpReader(ctx context.Context, derpFakeAddr netaddr.IPPort, d
case <-ctx.Done(): case <-ctx.Done():
return return
case c.derpRecvCh <- res: case c.derpRecvCh <- res:
<-didCopy continue
}
// The copy will not happen if connCtx is cancelled before we reach copyBuf.
// This has resulted in a rare inifite wait in practice.
select {
case <-ctx.Done():
return
case <-didCopy:
continue
} }
} }
} }