All of lore.kernel.org
 help / color / mirror / Atom feed
From: Josh Zimmerman <joshz-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
To: Peter Huewe <peterhuewe-Mmb7MZpHnFY@public.gmane.org>,
	Marcel Selhorst <tpmdd-yWjUBOtONefk1uMJSBkQmQ@public.gmane.org>,
	Jarkko Sakkinen
	<jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
	Jason Gunthorpe
	<jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>,
	tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Subject: [PATCH] tpm_tis: Issue a TPM2_Shutdown for TPM2 devices.
Date: Thu, 27 Apr 2017 11:26:59 -0700	[thread overview]
Message-ID: <20170427182659.403-1-joshz@google.com> (raw)

If a TPM2 loses power without a TPM2_Shutdown command being issued, it
may lose some state that has yet to be persisted to NVRam, and will
increment the DA counter (meaning that after too many disorderly
reboots, the TPM will lock the user out).

This is a variant of https://patchwork.kernel.org/patch/9516631/.
It differs in that:
  * It only changes behavior on TPM2 devices, to avoid invoking the
  unbounded-waiting sysfs codepath that was discussed on that patch.
  * It modifies tpm_tis rather than tpm_i2c_infineon, so that it can
  change behavior for all TPM2 devices.

Signed-off-by: Josh Zimmerman <joshz-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
---
 drivers/char/tpm/tpm_tis.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index c7e1384f1b08..bd9c70b305ab 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -216,11 +216,23 @@ static void tpm_tis_pnp_remove(struct pnp_dev *dev)
 	tpm_tis_remove(chip);
 }
 
+static void tpm_tis_pnp_shutdown(struct pnp_dev *dev)
+{
+	struct tpm_chip *chip = pnp_get_drvdata(dev);
+	// TPM 2.0 requires that the TPM2_Shutdown() command be issued prior to loss of power.
+	// If it is not, the DA counter will be incremented and, eventually, the user will be
+	// locked out of their TPM.
+	if (chip->flags & TPM_CHIP_FLAG_TPM2) {
+		tpm_tis_pnp_remove(dev);
+	}
+}
+
 static struct pnp_driver tis_pnp_driver = {
 	.name = "tpm_tis",
 	.id_table = tpm_pnp_tbl,
 	.probe = tpm_tis_pnp_init,
 	.remove = tpm_tis_pnp_remove,
+	.shutdown = tpm_tis_pnp_shutdown,
 	.driver	= {
 		.pm = &tpm_tis_pm,
 	},
-- 
2.13.0.rc0.306.g87b477812d-goog


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

             reply	other threads:[~2017-04-27 18:26 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-27 18:26 Josh Zimmerman [this message]
     [not found] ` <20170427182659.403-1-joshz-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2017-04-27 20:49   ` [PATCH] tpm_tis: Issue a TPM2_Shutdown for TPM2 devices Jason Gunthorpe
     [not found]     ` <20170427204912.GA26330-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-04-28 12:24       ` Jarkko Sakkinen
2017-04-28 12:12   ` Jarkko Sakkinen
     [not found]     ` <20170428121226.7xnpfbxcjszrnz5d-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-04-28 15:27       ` Jason Gunthorpe
     [not found]         ` <20170428152748.GA32017-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-04-28 18:27           ` Josh Zimmerman
     [not found]             ` <CAHSjozC=1GgKazv5m19X6Oe321+mkMUFCfFBQ=_c7kPQ-WESDA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-28 18:43               ` Jason Gunthorpe
     [not found]                 ` <20170428184325.GA15327-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-04-28 21:32                   ` Josh Zimmerman
     [not found]                     ` <CAHSjozDRHbuHD6dPfTGMnF4j66hPV-_WiD22y5WRpawPFMQmfQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-28 21:39                       ` Jason Gunthorpe
     [not found]                         ` <20170428213905.GA19326-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-04-28 21:45                           ` Rafael J. Wysocki
     [not found]                             ` <CAJZ5v0iFkLfmeQgZyQDoKF42=RQw6q_GdK3fLgwdC9_mDbJKjg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-28 22:16                               ` Jason Gunthorpe
     [not found]                                 ` <20170428221648.GA25935-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-04-28 23:30                                   ` Josh Zimmerman
2017-05-05 22:39                                   ` Josh Zimmerman
     [not found]                                     ` <CAHSjozCROVK=ca8tO+zNC+JD3a0+hQ-54AE7jGndrrs2nG1O1A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-05 22:46                                       ` Jason Gunthorpe
     [not found]                                         ` <20170505224629.GA15229-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-05-08 18:16                                           ` Josh Zimmerman
     [not found]                                             ` <CAHSjozCaWoQuQiWJ59_UyXnrnq=eh4sucLGgJ=0me6A0NHYsBA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-08 18:24                                               ` Jason Gunthorpe
     [not found]                                                 ` <20170508182415.GA32332-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-05-08 18:32                                                   ` Josh Zimmerman
2017-04-28 22:07                           ` Josh Zimmerman
     [not found]                             ` <CAHSjozA0-NVB1Nbr3DQ-2tsY3jVa6ADYUECfXjkNJWL3tfhWNA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-28 22:24                               ` Jason Gunthorpe
     [not found]                                 ` <20170428222439.GB25935-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-04-29 11:53                                   ` Jarkko Sakkinen
2017-04-29 11:52                           ` Jarkko Sakkinen
2017-04-29 11:48               ` Jarkko Sakkinen
2017-04-29 11:40           ` Jarkko Sakkinen
     [not found]             ` <20170429114013.67xwbv6xozarcieq-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-04-29 15:30               ` Jerry Snitselaar
2017-05-03 12:42                 ` 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=20170427182659.403-1-joshz@google.com \
    --to=joshz-hpiqsd4aklfqt0dzr+alfa@public.gmane.org \
    --cc=jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
    --cc=jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org \
    --cc=peterhuewe-Mmb7MZpHnFY@public.gmane.org \
    --cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
    --cc=tpmdd-yWjUBOtONefk1uMJSBkQmQ@public.gmane.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.