[GIT PULL] TPM bugfix

[GIT PULL] TPM bugfix

[James Morris]

Please pull this fix for the TPM code.


The following changes since commit 15301a570754c7af60335d094dd2d1808b0641a5:

  x86/paravirt: Do not trace _paravirt_ident_*() functions (2016-09-02 09:40:47 -0700)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

Jarkko Sakkinen (1):
      tpm: invalid self test error message

 drivers/char/tpm/tpm2-cmd.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

---

commit 85bd4528b88838a26b078ee3895c3cf3ad95b03c
Author: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date:   Fri Sep 2 02:36:58 2016 +0300

    tpm: invalid self test error message
    
    The driver emits invalid self test error message even though the init
    succeeds.
    
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Fixes: cae8b441fc20 ("tpm: Factor out common startup code")
    Reviewed-by: James Morris <james.l.morris@oracle.com>

diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index 08c7e23..0c75c3f 100644
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -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;

[GIT PULL] TPM bugfix

[James Morris]

Please pull this fix for 4.9.

The following changes since commit 2a26d99b251b8625d27aed14e97fc10707a3a81f:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2016-10-29 20:33:20 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

for you to fetch changes up to befd99656c5eb765fe9d96045c4cba099fd938db:

  tpm: remove invalid min length check from tpm_do_selftest() (2016-10-31 09:15:27 -0600)

----------------------------------------------------------------
Jarkko Sakkinen (1):
      tpm: remove invalid min length check from tpm_do_selftest()

 drivers/char/tpm/tpm-interface.c | 3 ---
 1 file changed, 3 deletions(-)


---

commit befd99656c5eb765fe9d96045c4cba099fd938db
Author: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date:   Tue Oct 4 09:49:47 2016 +0300

    tpm: remove invalid min length check from tpm_do_selftest()
    
    Removal of this check was not properly amended to the original commit.
    
    Cc: stable@vger.kernel.org
    Fixes: 0c541332231e ("tpm: use tpm_pcr_read_dev() in tpm_do_selftest()")
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: James Morris <james.l.morris@oracle.com>

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 8de6187..3a9149c 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);