linux-integrity.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: linux-stabley@vger.kernel.org
Cc: Vadim Sukhomlinov <sukhomlinov@google.com>,
	stable@vger.kernel.org, Douglas Anderson <dianders@chromium.org>,
	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
	Peter Huewe <peterhuewe@gmx.de>,
	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
	linux-integrity@vger.kernel.org (open list:TPM DEVICE DRIVER),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 3/3] tpm: Fix TPM 1.2 Shutdown sequence to prevent future TPM operations
Date: Wed,  2 Oct 2019 16:14:44 +0300	[thread overview]
Message-ID: <20191002131445.7793-4-jarkko.sakkinen@linux.intel.com> (raw)
In-Reply-To: <20191002131445.7793-1-jarkko.sakkinen@linux.intel.com>

From: Vadim Sukhomlinov <sukhomlinov@google.com>

commit db4d8cb9c9f2af71c4d087817160d866ed572cc9 upstream

TPM 2.0 Shutdown involve sending TPM2_Shutdown to TPM chip and disabling
future TPM operations. TPM 1.2 behavior was different, future TPM
operations weren't disabled, causing rare issues. This patch ensures
that future TPM operations are disabled.

Fixes: d1bd4a792d39 ("tpm: Issue a TPM2_Shutdown for TPM2 devices.")
Cc: stable@vger.kernel.org
Signed-off-by: Vadim Sukhomlinov <sukhomlinov@google.com>
[dianders: resolved merge conflicts with mainline]
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
 drivers/char/tpm/tpm-chip.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 0eca20c5a80c..dcf5bb153495 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -158,12 +158,13 @@ static int tpm_class_shutdown(struct device *dev)
 {
 	struct tpm_chip *chip = container_of(dev, struct tpm_chip, dev);
 
+	down_write(&chip->ops_sem);
 	if (chip->flags & TPM_CHIP_FLAG_TPM2) {
-		down_write(&chip->ops_sem);
 		tpm2_shutdown(chip, TPM2_SU_CLEAR);
 		chip->ops = NULL;
-		up_write(&chip->ops_sem);
 	}
+	chip->ops = NULL;
+	up_write(&chip->ops_sem);
 
 	return 0;
 }
-- 
2.20.1


  parent reply	other threads:[~2019-10-02 13:15 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-02 13:14 [PATCH 0/3] " Jarkko Sakkinen
2019-10-02 13:14 ` [PATCH 1/3] tpm: migrate pubek_show to struct tpm_buf Jarkko Sakkinen
2019-10-02 13:14 ` [PATCH 2/3] tpm: use tpm_try_get_ops() in tpm-sysfs.c Jarkko Sakkinen
2019-10-02 13:14 ` Jarkko Sakkinen [this message]
2019-10-02 13:57   ` [PATCH 3/3] tpm: Fix TPM 1.2 Shutdown sequence to prevent future TPM operations Greg KH
2019-10-02 15:17     ` Sasha Levin
2019-10-02 15:31       ` Jerry Snitselaar
2019-10-02 15:42         ` Jerry Snitselaar
2019-10-02 16:09           ` Greg KH
2019-10-03 11:24           ` Jarkko Sakkinen
2019-10-03 11:25             ` Jarkko Sakkinen
  -- strict thread matches above, loose matches on Subject: below --
2019-10-03 11:24 [PATCH 0/3] " Jarkko Sakkinen
2019-10-03 11:24 ` [PATCH 3/3] " Jarkko Sakkinen
2019-09-25 10:15 [PATCH 0/3] " Jarkko Sakkinen
2019-09-25 10:15 ` [PATCH 3/3] " Jarkko Sakkinen
2019-09-26 23:22   ` Sasha Levin
2019-09-24 14:01 [PATCH 0/3] " Jarkko Sakkinen
2019-09-24 14:02 ` [PATCH 3/3] " Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191002131445.7793-4-jarkko.sakkinen@linux.intel.com \
    --to=jarkko.sakkinen@linux.intel.com \
    --cc=dianders@chromium.org \
    --cc=jgunthorpe@obsidianresearch.com \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-stabley@vger.kernel.org \
    --cc=peterhuewe@gmx.de \
    --cc=stable@vger.kernel.org \
    --cc=sukhomlinov@google.com \
    --subject='Re: [PATCH 3/3] tpm: Fix TPM 1.2 Shutdown sequence to prevent future TPM operations' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).