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

torvalds · torvalds · commit 6eb3c6046838 · 2016-10-31T10:10:26.000-07:00
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()
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -813,9 +813,6 @@ int tpm_do_selftest(struct tpm_chip *chip)`
`813`	`813`	`continue;`
`814`	`814`	`}`
`815`	`815`
`816`		`- if (rc < TPM_HEADER_SIZE)`
`817`		`- return -EFAULT;`
`818`		`-`
`819`	`816`	`if (rc == TPM_ERR_DISABLED \|\| rc == TPM_ERR_DEACTIVATED) {`
`820`	`817`	`dev_info(&chip->dev,`
`821`	`818`	`"TPM is disabled/deactivated (0x%X)\n", rc);`