From 9a4a2db0fca60bc393dc91869bf48bd07dde7eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus=20Lensb=C3=B8l?= <claus@tailscale.com>
Date: Tue, 24 Mar 2026 20:36:34 -0400
Subject: [PATCH] control/controlclient: handle errors in
 rememberLastNetmapUpdator (#19112)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If errors occured, the updater could end up deadlocked.

Closing the done channel rather than adding to it, fixes a deadlock in
the corp tests.

Updates #19111

Signed-off-by: Claus Lensbøl <claus@tailscale.com>
---
 control/controlclient/direct.go   | 14 ++++++++++----
 control/controlclient/map_test.go |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/control/controlclient/direct.go b/control/controlclient/direct.go
index 46f759fc6..dc3ebd300 100644
--- a/control/controlclient/direct.go
+++ b/control/controlclient/direct.go
@@ -865,15 +865,21 @@ type rememberLastNetmapUpdater struct {
 
 func (nu *rememberLastNetmapUpdater) UpdateFullNetmap(nm *netmap.NetworkMap) {
 	nu.last = nm
-	nu.done <- nil
+	select {
+	case nu.done <- nil:
+	default:
+	}
 }
 
 // FetchNetMapForTest fetches the netmap once.
 func (c *Direct) FetchNetMapForTest(ctx context.Context) (*netmap.NetworkMap, error) {
 	var nu rememberLastNetmapUpdater
-	nu.done = make(chan any)
+	nu.done = make(chan any, 1)
 	err := c.sendMapRequest(ctx, false, &nu)
-	if err == nil && nu.last == nil {
+	if err != nil {
+		return nil, err
+	}
+	if nu.last == nil {
 		return nil, errors.New("[unexpected] sendMapRequest success without callback")
 	}
 	<-nu.done
@@ -1290,7 +1296,7 @@ func NetmapFromMapResponseForDebug(ctx context.Context, pr persist.PersistView,
 		return nil, errors.New("PersistView invalid")
 	}
 
-	nu := &rememberLastNetmapUpdater{done: make(chan any)}
+	nu := &rememberLastNetmapUpdater{done: make(chan any, 1)}
 	sess := newMapSession(pr.PrivateNodeKey(), nu, nil)
 	defer sess.Close()
 
diff --git a/control/controlclient/map_test.go b/control/controlclient/map_test.go
index 0a2838df9..154b9742e 100644
--- a/control/controlclient/map_test.go
+++ b/control/controlclient/map_test.go
@@ -669,7 +669,7 @@ func TestUpdateDiscoForNode(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			nu := &rememberLastNetmapUpdater{
-				done: make(chan any),
+				done: make(chan any, 1),
 			}
 			ms := newTestMapSession(t, nu)