From 913f68ce3820801e045632cb05c6f11e0df50b47 Mon Sep 17 00:00:00 2001 From: Haichao Liu Date: Wed, 18 Nov 2020 20:53:22 +0800 Subject: device: add write queue mutex for peer fix panic: send on closed channel when remove peer Signed-off-by: Haichao Liu Signed-off-by: Jason A. Donenfeld --- device/send.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'device/send.go') diff --git a/device/send.go b/device/send.go index c0bdba3..d202b62 100644 --- a/device/send.go +++ b/device/send.go @@ -107,6 +107,8 @@ func addToOutboundAndEncryptionQueues(outboundQueue chan *QueueOutboundElement, /* Queues a keepalive if no packets are queued for peer */ func (peer *Peer) SendKeepalive() bool { + peer.queue.RLock() + defer peer.queue.RUnlock() if len(peer.queue.nonce) != 0 || peer.queue.packetInNonceQueueIsAwaitingKey.Get() || !peer.isRunning.Get() { return false } @@ -310,6 +312,7 @@ func (device *Device) RoutineReadFromTUN() { // insert into nonce/pre-handshake queue + peer.queue.RLock() if peer.isRunning.Get() { if peer.queue.packetInNonceQueueIsAwaitingKey.Get() { peer.SendHandshakeInitiation(false) @@ -317,6 +320,7 @@ func (device *Device) RoutineReadFromTUN() { addToNonceQueue(peer.queue.nonce, elem, device) elem = nil } + peer.queue.RUnlock() } } -- cgit v1.2.3-59-g8ed1b