ソースを参照

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 <[email protected]>
Andrew Lytvynov 3 ヶ月 前
コミット
9eff8a4503
1 ファイル変更8 行追加1 行削除
  1. 8 1
      feature/tpm/tpm_linux.go

+ 8 - 1
feature/tpm/tpm_linux.go

@@ -4,6 +4,8 @@
 package tpm
 
 import (
+	"errors"
+
 	"github.com/google/go-tpm/tpm2/transport"
 	"github.com/google/go-tpm/tpm2/transport/linuxtpm"
 )
@@ -13,5 +15,10 @@ func open() (transport.TPMCloser, error) {
 	if err == 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...)
 }