tpm: Add check for Failure mode for TPM2 modules

In commit 0aa698787aa2 ("tpm: Add Upgrade/Reduced mode support for
TPM2 modules") it was said that:

"If the TPM is in Failure mode, it will successfully respond to both
tpm2_do_selftest() and tpm2_startup() calls. Although, will fail to
answer to tpm2_get_cc_attrs_tbl(). Use this fact to conclude that TPM
is in Failure mode."

But a check was never added in the commit when calling
tpm2_get_cc_attrs_tbl() to conclude that the TPM is in Failure mode.
This commit corrects this by adding a check.

Fixes: 0aa698787aa2 ("tpm: Add Upgrade/Reduced mode support for TPM2 modules")
Cc: [email protected] # v5.17+
Signed-off-by: Mårten Lindahl <[email protected]>
Reviewed-by: Jarkko Sakkinen <[email protected]>
Signed-off-by: Jarkko Sakkinen <[email protected]>

diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index c1eb5d223839579e087a27774bf3adb9f2b45f21..65d03867e114c563de61fbb6e06cbfe4505cfd99 100644 (file)
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -752,6 +752,12 @@ int tpm2_auto_startup(struct tpm_chip *chip)
        }
 
        rc = tpm2_get_cc_attrs_tbl(chip);
+       if (rc == TPM2_RC_FAILURE || (rc < 0 && rc != -ENOMEM)) {
+               dev_info(&chip->dev,
+                        "TPM in field failure mode, requires firmware upgrade\n");
+               chip->flags |= TPM_CHIP_FLAG_FIRMWARE_UPGRADE;
+               rc = 0;
+       }
 
 out:
        /*