From 4102a687e3b95e0dc9904a05241dfe5dfc13228b Mon Sep 17 00:00:00 2001
From: Maisem Ali <maisem@tailscale.com>
Date: Sat, 1 Oct 2022 16:33:13 -0700
Subject: [PATCH] tsnet: fix netstack leak on Close

Identified while investigating a goroutine leak in a different repo.

Signed-off-by: Maisem Ali <maisem@tailscale.com>
---
 tsnet/tsnet.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tsnet/tsnet.go b/tsnet/tsnet.go
index cdd30225b..bc063437c 100644
--- a/tsnet/tsnet.go
+++ b/tsnet/tsnet.go
@@ -84,6 +84,7 @@ type Server struct {
 	initOnce         sync.Once
 	initErr          error
 	lb               *ipnlocal.LocalBackend
+	netstack         *netstack.Impl
 	linkMon          *monitor.Mon
 	localAPIListener net.Listener
 	rootPath         string // the state directory
@@ -151,6 +152,10 @@ func (s *Server) Close() error {
 		}()
 	}
 
+	if s.netstack != nil {
+		s.netstack.Close()
+		s.netstack = nil
+	}
 	s.shutdownCancel()
 	s.lb.Shutdown()
 	s.linkMon.Close()
@@ -296,6 +301,7 @@ func (s *Server) start() (reterr error) {
 	if err := ns.Start(); err != nil {
 		return fmt.Errorf("failed to start netstack: %w", err)
 	}
+	s.netstack = ns
 	s.dialer.UseNetstackForIP = func(ip netip.Addr) bool {
 		_, ok := eng.PeerForIP(ip)
 		return ok