TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-23 19:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/portmapper: avert a panic when a mapping is not available (#16686)

Browse Source 
Ideally when we attempt to create a new port mapping, we should not return
without error when no mapping is available. We already log these cases as
unexpected, so this change is just to avoiding panicking dispatch on the
invalid result in those cases. We still separately need to fix the underlying
control flow.

Updates #16662

Change-Id: I51e8a116b922b49eda45e31cd27f6b89dd51abc8

Signed-off-by: M. J. Fromberger <fromberger@tailscale.com>
(cherry picked from commit 5ce3845a02)
This commit is contained in:
M. J. Fromberger
2025-07-28 09:01:41 -07:00
committed by Nick Khyl
parent 4123469edf
commit 9c7305074a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/portmapper/portmapper.go
View File

@@ -507,6 +507,13 @@ func (c *Client) createMapping() {
c.logf("createOrGetMapping: %v", err)
}
return
} else if mapping == nil {
return
// TODO(creachadair): This was already logged in createOrGetMapping.
// It really should not happen at all, but we will need to untangle
// the control flow to eliminate that possibility. Meanwhile, this
// mitigates a panic downstream, cf. #16662.
}
if c.updates != nil {
c.updates.Publish(Mapping{