TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-11 10:33:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/containerboot: guard kubeClient against nil dereference (#14357)

Browse Source 
A method on kc was called unconditionally, even if was not initialized,
leading to a nil pointer dereference when TS_SERVE_CONFIG was set
outside Kubernetes.

Add a guard symmetric with other uses of the kubeClient.

Fixes #14354.

Signed-off-by: Bjorn Neergaard <bjorn@neersighted.com>
This commit is contained in:
Bjorn Neergaard 2024-12-11 02:52:56 -07:00 committed by GitHub
parent d54cd59390
commit 8b1d01161b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/containerboot/main.go
View File

@ -331,8 +331,10 @@ authLoop:
if err := client.SetServeConfig(ctx, new(ipn.ServeConfig)); err != nil { if err := client.SetServeConfig(ctx, new(ipn.ServeConfig)); err != nil {
log.Fatalf("failed to unset serve config: %v", err) log.Fatalf("failed to unset serve config: %v", err)
} }
if err := kc.storeHTTPSEndpoint(ctx, ""); err != nil { if hasKubeStateStore(cfg) {
log.Fatalf("failed to update HTTPS endpoint in tailscale state: %v", err) if err := kc.storeHTTPSEndpoint(ctx, ""); err != nil {
log.Fatalf("failed to update HTTPS endpoint in tailscale state: %v", err)
}
} }
} }