From ee0c7b05a5b6deabd9492276db608952cff11b57 Mon Sep 17 00:00:00 2001
From: "M. J. Fromberger" <fromberger@tailscale.com>
Date: Tue, 12 Aug 2025 10:19:33 -0700
Subject: [PATCH] cmd/tailscale: fix a panic in netcheck portmapper
 construction (#16843)

This affects the 1.87.33 unstable release.

Updates #16842
Updates #15160

Change-Id: Ie6d1b2c094d1a6059fbd1023760567900f06e0ad
Signed-off-by: M. J. Fromberger <fromberger@tailscale.com>
---
 cmd/tailscale/cli/netcheck.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd/tailscale/cli/netcheck.go b/cmd/tailscale/cli/netcheck.go
index 3cf05a3b7..0bdab59cb 100644
--- a/cmd/tailscale/cli/netcheck.go
+++ b/cmd/tailscale/cli/netcheck.go
@@ -59,8 +59,9 @@ func runNetcheck(ctx context.Context, args []string) error {
 	// Ensure that we close the portmapper after running a netcheck; this
 	// will release any port mappings created.
 	pm := portmapper.NewClient(portmapper.Config{
-		Logf:   logf,
-		NetMon: netMon,
+		Logf:     logf,
+		NetMon:   netMon,
+		EventBus: bus,
 	})
 	defer pm.Close()