tpm: Disable TPM on tpm2_create_primary() failure

The earlier bug fix misplaced the error-label when dealing with the
tpm2_create_primary() return value, which the original completely ignored.

Cc: stable@vger.kernel.org
Reported-by: Christoph Anton Mitterer <calestyo@scientia.org>
Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087331
Fixes: cc7d8594342a ("tpm: Rollback tpm2_load_null()")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>

diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c
index 52d3523042fb8238bbd20a0ad195bfa916c49897..b0f13c8ea79c7a95fb3315cb5f5f6729feb90445 100644 (file)
--- a/drivers/char/tpm/tpm2-sessions.c
+++ b/drivers/char/tpm/tpm2-sessions.c
@@ -953,10 +953,13 @@ static int tpm2_load_null(struct tpm_chip *chip, u32 *null_key)
        /* Deduce from the name change TPM interference: */
        dev_err(&chip->dev, "null key integrity check failed\n");
        tpm2_flush_context(chip, tmp_null_key);
-       chip->flags |= TPM_CHIP_FLAG_DISABLE;
 
 err:
-       return rc ? -ENODEV : 0;
+       if (rc) {
+               chip->flags |= TPM_CHIP_FLAG_DISABLE;
+               rc = -ENODEV;
+       }
+       return rc;
 }
 
 /**