linux-security

Pull TPM bugfix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  tpm: invalid self test error message

parents 601b5869 4a29b348

drivers/char/tpm/tpm2-cmd.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -957,7 +957,7 @@ int tpm2_auto_startup(struct tpm_chip *chip)
		goto out;

		rc = tpm2_do_selftest(chip);
		if (rc != TPM2_RC_INITIALIZE) {
		if (rc != 0 && rc != TPM2_RC_INITIALIZE) {
		dev_err(&chip->dev, "TPM self test failed\n");
		goto out;
		}
		@@ -974,7 +974,6 @@ int tpm2_auto_startup(struct tpm_chip *chip)
		}
		}

		return rc;
		out:
		if (rc > 0)
		rc = -ENODEV;