aboutsummaryrefslogtreecommitdiffstats
path: root/device/send.go
diff options
context:
space:
mode:
authorJosh Bleecher Snyder <josh@tailscale.com>2021-02-09 09:53:00 -0800
committerJosh Bleecher Snyder <josh@tailscale.com>2021-02-09 09:53:00 -0800
commit4eab21a7b7192dc806a3d60c46827866fc8942fe (patch)
treefba61d85d5c4b8d16e050af626ff180b3193eb0b /device/send.go
parentconn: try harder to have v4 and v6 ports agree (diff)
downloadwireguard-go-4eab21a7b7192dc806a3d60c46827866fc8942fe.tar.xz
wireguard-go-4eab21a7b7192dc806a3d60c46827866fc8942fe.zip
device: make RoutineReadFromTUN keep encryption queue alive
RoutineReadFromTUN can trigger a call to SendStagedPackets. SendStagedPackets attempts to protect against sending on the encryption queue by checking peer.isRunning and device.isClosed. However, those are subject to TOCTOU bugs. If that happens, we get this: goroutine 1254 [running]: golang.zx2c4.com/wireguard/device.(*Peer).SendStagedPackets(0xc000798300) .../wireguard-go/device/send.go:321 +0x125 golang.zx2c4.com/wireguard/device.(*Device).RoutineReadFromTUN(0xc000014780) .../wireguard-go/device/send.go:271 +0x21c created by golang.zx2c4.com/wireguard/device.NewDevice .../wireguard-go/device/device.go:315 +0x298 Fix this with a simple, big hammer: Keep the encryption queue alive as long as it might be written to. Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
Diffstat (limited to 'device/send.go')
-rw-r--r--device/send.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/device/send.go b/device/send.go
index 783e5b9..6a3b30b 100644
--- a/device/send.go
+++ b/device/send.go
@@ -206,6 +206,7 @@ func (device *Device) RoutineReadFromTUN() {
defer func() {
device.log.Verbosef("Routine: TUN reader - stopped")
device.state.stopping.Done()
+ device.queue.encryption.wg.Done()
}()
device.log.Verbosef("Routine: TUN reader - started")