feature/tpm: return opening errors from both /dev/tpmrm0 and /dev/tpm0 (#18071)

This might help users diagnose why TPM access is failing for tpmrm0.

Fixes #18026

Signed-off-by: Andrew Lytvynov <awly@tailscale.com>
raggi/disco-key-tsmp2
Andrew Lytvynov 1 week ago committed by GitHub
parent 8af7778ce0
commit 9eff8a4503
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -4,6 +4,8 @@
package tpm package tpm
import ( import (
"errors"
"github.com/google/go-tpm/tpm2/transport" "github.com/google/go-tpm/tpm2/transport"
"github.com/google/go-tpm/tpm2/transport/linuxtpm" "github.com/google/go-tpm/tpm2/transport/linuxtpm"
) )
@ -13,5 +15,10 @@ func open() (transport.TPMCloser, error) {
if err == nil { if err == nil {
return tpm, nil return tpm, nil
} }
return linuxtpm.Open("/dev/tpm0") errs := []error{err}
tpm, err = linuxtpm.Open("/dev/tpm0")
if err == nil {
return tpm, nil
}
return nil, errors.Join(errs...)
} }

Loading…
Cancel
Save