tpmdd-devel.lists.sourceforge.net archive mirror
 help / color / mirror / Atom feed
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Josh Zimmerman <joshz@google.com>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
	tpmdd-devel@lists.sourceforge.net, gregkh@linuxfoundation.org,
	stable@vger.kernel.org
Subject: Re: [PATCH v1 2/2] tpm: Issue a TPM2_Shutdown for TPM2 devices.
Date: Sun, 16 Jul 2017 13:42:19 +0300	[thread overview]
Message-ID: <20170716104219.6aert3julby7ic75@linux.intel.com> (raw)
In-Reply-To: <20170713004121.21750-3-joshz@google.com>

On Wed, Jul 12, 2017 at 05:41:21PM -0700, Josh Zimmerman wrote:
> Backport of d1bd4a792d3961a04e6154118816b00167aad91a upstream.
> 
> If a TPM2 loses power without a TPM2_Shutdown command being issued (a
> "disorderly reboot"), it may lose some state that has yet to be
> persisted to NVRam, and will increment the DA counter. After the DA
> counter gets sufficiently large, the TPM will lock the user out.
> 
> NOTE: This only changes behavior on TPM2 devices. Since TPM1 uses sysfs,
> and sysfs relies on implicit locking on chip->ops, it is not safe to
> allow this code to run in TPM1, or to add sysfs support to TPM2, until
> that locking is made explicit.
> 
> Signed-off-by: Josh Zimmerman <joshz@google.com>

Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

/Jarkko


> ---
>  drivers/char/tpm/tpm-chip.c  | 36 ++++++++++++++++++++++++++++++++++++
>  drivers/char/tpm/tpm-sysfs.c |  5 +++++
>  2 files changed, 41 insertions(+)
> 
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index a017ccd8cc3b..9ff853229957 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -130,6 +130,41 @@ static void tpm_dev_release(struct device *dev)
>  	kfree(chip);
>  }
>  
> +
> +/**
> + * tpm_class_shutdown() - prepare the TPM device for loss of power.
> + * @dev: device to which the chip is associated.
> + *
> + * Issues a TPM2_Shutdown command prior to loss of power, as required by the
> + * TPM 2.0 spec.
> + * Then, calls bus- and device- specific shutdown code.
> + *
> + * XXX: This codepath relies on the fact that sysfs is not enabled for
> + * TPM2: sysfs uses an implicit lock on chip->ops, so this could race if TPM2
> + * has sysfs support enabled before TPM sysfs's implicit locking is fixed.
> + */
> +static int tpm_class_shutdown(struct device *dev)
> +{
> +	struct tpm_chip *chip = container_of(dev, struct tpm_chip, dev);
> +
> +	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);
> +	}
> +	/* Allow bus- and device-specific code to run. Note: since chip->ops
> +	 * is NULL, more-specific shutdown code will not be able to issue TPM
> +	 * commands.
> +	 */
> +	if (dev->bus && dev->bus->shutdown)
> +		dev->bus->shutdown(dev);
> +	else if (dev->driver && dev->driver->shutdown)
> +		dev->driver->shutdown(dev);
> +	return 0;
> +}
> +
> +
>  /**
>   * tpm_chip_alloc() - allocate a new struct tpm_chip instance
>   * @pdev: device to which the chip is associated
> @@ -168,6 +203,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *pdev,
>  	device_initialize(&chip->dev);
>  
>  	chip->dev.class = tpm_class;
> +	chip->dev.class->shutdown = tpm_class_shutdown;
>  	chip->dev.release = tpm_dev_release;
>  	chip->dev.parent = pdev;
>  	chip->dev.groups = chip->groups;
> diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
> index a76ab4af9fb2..774148db0fac 100644
> --- a/drivers/char/tpm/tpm-sysfs.c
> +++ b/drivers/char/tpm/tpm-sysfs.c
> @@ -284,6 +284,11 @@ static const struct attribute_group tpm_dev_group = {
>  
>  void tpm_sysfs_add_device(struct tpm_chip *chip)
>  {
> +	/* XXX: If you wish to remove this restriction, you must first update
> +	 * tpm_sysfs to explicitly lock chip->ops.
> +	 */
> +	if (chip->flags & TPM_CHIP_FLAG_TPM2)
> +		return;
>  	/* The sysfs routines rely on an implicit tpm_try_get_ops, device_del
>  	 * is called before ops is null'd and the sysfs core synchronizes this
>  	 * removal so that no callbacks are running or can run again
> -- 
> 2.13.2.932.g7449e964c-goog
> 

  reply	other threads:[~2017-07-16 10:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-13  0:41 [PATCH v1 0/2] Run TPM2_Shutdown on system shutdown Josh Zimmerman
2017-07-13  0:41 ` [PATCH v1 1/2] Add "shutdown" to "struct class".' Josh Zimmerman
2017-07-16 10:42   ` Jarkko Sakkinen
2017-07-13  0:41 ` [PATCH v1 2/2] tpm: Issue a TPM2_Shutdown for TPM2 devices Josh Zimmerman
2017-07-16 10:42   ` Jarkko Sakkinen [this message]
2017-07-13  2:13 ` [PATCH v1 0/2] Run TPM2_Shutdown on system shutdown Josh Zimmerman
2017-07-13 12:23   ` Greg Kroah-Hartman

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=20170716104219.6aert3julby7ic75@linux.intel.com \
    --to=jarkko.sakkinen@linux.intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jgunthorpe@obsidianresearch.com \
    --cc=joshz@google.com \
    --cc=stable@vger.kernel.org \
    --cc=tpmdd-devel@lists.sourceforge.net \
    --subject='Re: [PATCH v1 2/2] tpm: Issue a TPM2_Shutdown for TPM2 devices.' \
    /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).