Commit 423893fc authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

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: default avatarChristoph Anton Mitterer <calestyo@scientia.org>
Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087331


Fixes: cc7d8594 ("tpm: Rollback tpm2_load_null()")
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent 27184f89

drivers/char/tpm/tpm2-sessions.c

+5 −2
Original line number Diff line number Diff line
@@ -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;

}



/**