Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944134AbcJaP3g (ORCPT ); Mon, 31 Oct 2016 11:29:36 -0400 Received: from [65.99.196.166] ([65.99.196.166]:58505 "EHLO namei.org" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S944062AbcJaP3e (ORCPT ); Mon, 31 Oct 2016 11:29:34 -0400 Date: Tue, 1 Nov 2016 02:28:28 +1100 (AEDT) From: James Morris To: Linus Torvalds cc: linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, Jarkko Sakkinen Subject: [GIT PULL] TPM bugfix Message-ID: User-Agent: Alpine 2.20 (LRH 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1722 Lines: 51 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 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 Signed-off-by: James Morris 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);