diff options
| author | Linus Torvalds | 2016-10-31 18:10:26 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-10-31 18:10:26 +0100 |
| commit | 6eb3c6046838cd38fc0a6897e5d8b9a882aadcdd (patch) | |
| tree | 02ebeb5e62438b03ae929d971304a730ba27a465 | |
| parent | Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm (diff) | |
| parent | tpm: remove invalid min length check from tpm_do_selftest() (diff) | |
| download | kernel-qcow2-linux-6eb3c6046838cd38fc0a6897e5d8b9a882aadcdd.tar.gz kernel-qcow2-linux-6eb3c6046838cd38fc0a6897e5d8b9a882aadcdd.tar.xz kernel-qcow2-linux-6eb3c6046838cd38fc0a6897e5d8b9a882aadcdd.zip | |
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()
| -rw-r--r-- | drivers/char/tpm/tpm-interface.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 8de61876f633..3a9149cf0110 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -813,9 +813,6 @@ int tpm_do_selftest(struct tpm_chip *chip) continue; } - if (rc < TPM_HEADER_SIZE) - return -EFAULT; - if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) { dev_info(&chip->dev, "TPM is disabled/deactivated (0x%X)\n", rc); |