Merge pull request #45 from coder/spike/10876-fix-close-rebind

fix: hold magicsock mutex while rebinding to prevent race
coder · Dec 5, 2023 · 61c97ba · 61c97ba
2 parents ba3acaa + f517cfd
commit 61c97ba
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
@@ -2339,7 +2339,14 @@ func (c *Conn) rebind(curPortFate currentPortFate) error {
 // It should be followed by a call to ReSTUN.
 func (c *Conn) Rebind() {
 	metricRebindCalls.Add(1)
-	if err := c.rebind(keepCurrentPort); err != nil {
+	c.mu.Lock()
+	if c.closed {
+		c.mu.Unlock()
+		return
+	}
+	err := c.rebind(keepCurrentPort)
+	c.mu.Unlock()
+	if err != nil {
 		c.logf("%w", err)
 		return
 	}