* [PATCH v1 0/2] Run TPM2_Shutdown on system shutdown
@ 2017-07-13 0:41 Josh Zimmerman
2017-07-13 0:41 ` [PATCH v1 1/2] Add "shutdown" to "struct class".' Josh Zimmerman
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Josh Zimmerman @ 2017-07-13 0:41 UTC (permalink / raw)
To: Jarkko Sakkinen, Jason Gunthorpe, tpmdd-devel, gregkh, stable
This patchset causes all devices in the tpm class to issue TPM2_Shutdown
when the system is shutting down.
As a prerequisite, it adds a "shutdown" method to "struct class".
Backporting to 4.9 since this bug can lock users out of their TPMs.
Backport of f77af1516584 'Add "shutdown" to "struct class".' and
d1bd4a792d39 'tpm: Issue a TPM2_Shutdown for TPM2 devices.'
drivers/base/core.c | 6 +++++-
drivers/char/tpm/tpm-chip.c | 36 ++++++++++++++++++++++++++++++++++++
drivers/char/tpm/tpm-sysfs.c | 5 +++++
include/linux/device.h | 2 ++
4 files changed, 48 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v1 1/2] Add "shutdown" to "struct class".' 2017-07-13 0:41 [PATCH v1 0/2] Run TPM2_Shutdown on system shutdown Josh Zimmerman @ 2017-07-13 0:41 ` 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-13 2:13 ` [PATCH v1 0/2] Run TPM2_Shutdown on system shutdown Josh Zimmerman 2 siblings, 1 reply; 7+ messages in thread From: Josh Zimmerman @ 2017-07-13 0:41 UTC (permalink / raw) To: Jarkko Sakkinen, Jason Gunthorpe, tpmdd-devel, gregkh, stable Cc: Josh Zimmerman Backport of commit f77af15165847406b15d8f70c382c4cb15846b2a upstream. The TPM class has some common shutdown code that must be executed for all drivers. This adds some needed functionality for that. Signed-off-by: Josh Zimmerman <joshz@google.com> --- drivers/base/core.c | 6 +++++- include/linux/device.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index ce057a568673..03a82d017cf1 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -2095,7 +2095,11 @@ void device_shutdown(void) pm_runtime_get_noresume(dev); pm_runtime_barrier(dev); - if (dev->bus && dev->bus->shutdown) { + if (dev->class && dev->class->shutdown) { + if (initcall_debug) + dev_info(dev, "shutdown\n"); + dev->class->shutdown(dev); + } else if (dev->bus && dev->bus->shutdown) { if (initcall_debug) dev_info(dev, "shutdown\n"); dev->bus->shutdown(dev); diff --git a/include/linux/device.h b/include/linux/device.h index bc41e87a969b..df850f723264 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -373,6 +373,7 @@ int subsys_virtual_register(struct bus_type *subsys, * @suspend: Used to put the device to sleep mode, usually to a low power * state. * @resume: Used to bring the device from the sleep mode. + * @shutdown: Called at shut-down time to quiesce the device. * @ns_type: Callbacks so sysfs can detemine namespaces. * @namespace: Namespace of the device belongs to this class. * @pm: The default device power management operations of this class. @@ -401,6 +402,7 @@ struct class { int (*suspend)(struct device *dev, pm_message_t state); int (*resume)(struct device *dev); + int (*shutdown)(struct device *dev); const struct kobj_ns_type_operations *ns_type; const void *(*namespace)(struct device *dev); -- 2.13.2.932.g7449e964c-goog ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v1 1/2] Add "shutdown" to "struct class".' 2017-07-13 0:41 ` [PATCH v1 1/2] Add "shutdown" to "struct class".' Josh Zimmerman @ 2017-07-16 10:42 ` Jarkko Sakkinen 0 siblings, 0 replies; 7+ messages in thread From: Jarkko Sakkinen @ 2017-07-16 10:42 UTC (permalink / raw) To: Josh Zimmerman; +Cc: Jason Gunthorpe, tpmdd-devel, gregkh, stable On Wed, Jul 12, 2017 at 05:41:20PM -0700, Josh Zimmerman wrote: > Backport of commit f77af15165847406b15d8f70c382c4cb15846b2a upstream. > > The TPM class has some common shutdown code that must be executed for > all drivers. This adds some needed functionality for that. > > Signed-off-by: Josh Zimmerman <joshz@google.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko > --- > drivers/base/core.c | 6 +++++- > include/linux/device.h | 2 ++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/base/core.c b/drivers/base/core.c > index ce057a568673..03a82d017cf1 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -2095,7 +2095,11 @@ void device_shutdown(void) > pm_runtime_get_noresume(dev); > pm_runtime_barrier(dev); > > - if (dev->bus && dev->bus->shutdown) { > + if (dev->class && dev->class->shutdown) { > + if (initcall_debug) > + dev_info(dev, "shutdown\n"); > + dev->class->shutdown(dev); > + } else if (dev->bus && dev->bus->shutdown) { > if (initcall_debug) > dev_info(dev, "shutdown\n"); > dev->bus->shutdown(dev); > diff --git a/include/linux/device.h b/include/linux/device.h > index bc41e87a969b..df850f723264 100644 > --- a/include/linux/device.h > +++ b/include/linux/device.h > @@ -373,6 +373,7 @@ int subsys_virtual_register(struct bus_type *subsys, > * @suspend: Used to put the device to sleep mode, usually to a low power > * state. > * @resume: Used to bring the device from the sleep mode. > + * @shutdown: Called at shut-down time to quiesce the device. > * @ns_type: Callbacks so sysfs can detemine namespaces. > * @namespace: Namespace of the device belongs to this class. > * @pm: The default device power management operations of this class. > @@ -401,6 +402,7 @@ struct class { > > int (*suspend)(struct device *dev, pm_message_t state); > int (*resume)(struct device *dev); > + int (*shutdown)(struct device *dev); > > const struct kobj_ns_type_operations *ns_type; > const void *(*namespace)(struct device *dev); > -- > 2.13.2.932.g7449e964c-goog > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 2/2] tpm: Issue a TPM2_Shutdown for TPM2 devices. 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-13 0:41 ` Josh Zimmerman 2017-07-16 10:42 ` Jarkko Sakkinen 2017-07-13 2:13 ` [PATCH v1 0/2] Run TPM2_Shutdown on system shutdown Josh Zimmerman 2 siblings, 1 reply; 7+ messages in thread From: Josh Zimmerman @ 2017-07-13 0:41 UTC (permalink / raw) To: Jarkko Sakkinen, Jason Gunthorpe, tpmdd-devel, gregkh, stable Cc: Josh Zimmerman 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> --- 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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v1 2/2] tpm: Issue a TPM2_Shutdown for TPM2 devices. 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 0 siblings, 0 replies; 7+ messages in thread From: Jarkko Sakkinen @ 2017-07-16 10:42 UTC (permalink / raw) To: Josh Zimmerman; +Cc: Jason Gunthorpe, tpmdd-devel, gregkh, stable 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 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v1 0/2] Run TPM2_Shutdown on system shutdown 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-13 0:41 ` [PATCH v1 2/2] tpm: Issue a TPM2_Shutdown for TPM2 devices Josh Zimmerman @ 2017-07-13 2:13 ` Josh Zimmerman 2017-07-13 12:23 ` Greg Kroah-Hartman 2 siblings, 1 reply; 7+ messages in thread From: Josh Zimmerman @ 2017-07-13 2:13 UTC (permalink / raw) To: Jarkko Sakkinen, Jason Gunthorpe, tpmdd-devel, Greg Kroah-Hartman, stable On Wed, Jul 12, 2017 at 5:41 PM, Josh Zimmerman <joshz@google.com> wrote: > This patchset causes all devices in the tpm class to issue TPM2_Shutdown > when the system is shutting down. > > As a prerequisite, it adds a "shutdown" method to "struct class". > > Backporting to 4.9 since this bug can lock users out of their TPMs. > > Backport of f77af1516584 'Add "shutdown" to "struct class".' and > d1bd4a792d39 'tpm: Issue a TPM2_Shutdown for TPM2 devices.' > > drivers/base/core.c | 6 +++++- > drivers/char/tpm/tpm-chip.c | 36 ++++++++++++++++++++++++++++++++++++ > drivers/char/tpm/tpm-sysfs.c | 5 +++++ > include/linux/device.h | 2 ++ > 4 files changed, 48 insertions(+), 1 deletion(-) In case this wasn't clear, this backport was tested on 4.9. I have not yet tested on 4.4. I'm intending to test and send another patch for that later this week (ideally tomorrow). Josh ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v1 0/2] Run TPM2_Shutdown on system shutdown 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 0 siblings, 0 replies; 7+ messages in thread From: Greg Kroah-Hartman @ 2017-07-13 12:23 UTC (permalink / raw) To: Josh Zimmerman; +Cc: Jarkko Sakkinen, Jason Gunthorpe, tpmdd-devel, stable On Wed, Jul 12, 2017 at 07:13:40PM -0700, Josh Zimmerman wrote: > On Wed, Jul 12, 2017 at 5:41 PM, Josh Zimmerman <joshz@google.com> wrote: > > This patchset causes all devices in the tpm class to issue TPM2_Shutdown > > when the system is shutting down. > > > > As a prerequisite, it adds a "shutdown" method to "struct class". > > > > Backporting to 4.9 since this bug can lock users out of their TPMs. > > > > Backport of f77af1516584 'Add "shutdown" to "struct class".' and > > d1bd4a792d39 'tpm: Issue a TPM2_Shutdown for TPM2 devices.' > > > > drivers/base/core.c | 6 +++++- > > drivers/char/tpm/tpm-chip.c | 36 ++++++++++++++++++++++++++++++++++++ > > drivers/char/tpm/tpm-sysfs.c | 5 +++++ > > include/linux/device.h | 2 ++ > > 4 files changed, 48 insertions(+), 1 deletion(-) > > > In case this wasn't clear, this backport was tested on 4.9. I have not > yet tested on 4.4. I'm intending to test and send another patch for > that later this week (ideally tomorrow). Thanks, both now queued up in the 4.9-stable queue. greg k-h ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-07-16 10:42 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 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
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).