Commit 6eb3c604 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull TPM fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  tpm: remove invalid min length check from tpm_do_selftest()
parents 41ec793d befd9965
...@@ -813,9 +813,6 @@ int tpm_do_selftest(struct tpm_chip *chip) ...@@ -813,9 +813,6 @@ int tpm_do_selftest(struct tpm_chip *chip)
continue; continue;
} }
if (rc < TPM_HEADER_SIZE)
return -EFAULT;
if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) { if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) {
dev_info(&chip->dev, dev_info(&chip->dev,
"TPM is disabled/deactivated (0x%X)\n", rc); "TPM is disabled/deactivated (0x%X)\n", rc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment