mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-01 15:32:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

feature/tpm: check IsZero in clone instead of just nil (#17884)

Browse Source 
The key.NewEmptyHardwareAttestationKey hook returns a non-nil empty
attestationKey, which means that the nil check in Clone doesn't trigger
and proceeds to try and clone an empty key. Check IsZero instead to
reduce log spam from Clone.

As a drive-by, make tpmAvailable check a sync.Once because the result
won't change.

Updates #17882

Signed-off-by: Andrew Lytvynov <awly@tailscale.com>
This commit is contained in:
Andrew Lytvynov 2025-11-14 13:23:25 -08:00 committed by GitHub
parent 888a5d4812
commit c5919b4ed1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feature/tpm/attestation.go
View File

@ -274,7 +274,7 @@ func (ak *attestationKey) Close() error {
}
func (ak *attestationKey) Clone() key.HardwareAttestationKey {
if ak == nil {
if ak.IsZero() {
return nil
}

9
feature/tpm/tpm.go
View File

@ -35,12 +35,15 @@ import (
"tailscale.com/util/testenv"
)
var infoOnce = sync.OnceValue(info)
var (
infoOnce = sync.OnceValue(info)
tpmSupportedOnce = sync.OnceValue(tpmSupported)
)
func init() {
feature.Register("tpm")
feature.HookTPMAvailable.Set(tpmSupported)
feature.HookHardwareAttestationAvailable.Set(tpmSupported)
feature.HookTPMAvailable.Set(tpmSupportedOnce)
feature.HookHardwareAttestationAvailable.Set(tpmSupportedOnce)
hostinfo.RegisterHostinfoNewHook(func(hi *tailcfg.Hostinfo) {
hi.TPM = infoOnce()