All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] tpm: vtpm_proxy: Do not run tpm2_shutdown
@ 2017-05-25 13:12 ` Stefan Berger
  0 siblings, 0 replies; 26+ messages in thread
From: Stefan Berger @ 2017-05-25 13:12 UTC (permalink / raw)
  To: linux-security-module

The tpm2_shutdown does not work with the VTPM proxy driver since the
function only gets called when the backend file descriptor is already
closed and at this point no data can be sent anymore. A proper shutdown
would have to be initated by a user space application, such as a container
management stack, that sends the command via the character device before
terminating the TPM emulator.

To avoid the tpm2_shutdown we introduce a TPM_CHIP_FLAG_NO_SHUTDOWN flag
that only the VTPM proxy driver sets. This also avoids misleading kernel
log messages.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 drivers/char/tpm/tpm.h            | 1 +
 drivers/char/tpm/tpm2-cmd.c       | 3 +++
 drivers/char/tpm/tpm_vtpm_proxy.c | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 25d9858..23b656f 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -170,6 +170,7 @@ enum tpm_chip_flags {
 	TPM_CHIP_FLAG_IRQ		= BIT(2),
 	TPM_CHIP_FLAG_VIRTUAL		= BIT(3),
 	TPM_CHIP_FLAG_HAVE_TIMEOUTS	= BIT(4),
+	TPM_CHIP_FLAG_NO_SHUTDOWN	= BIT(5),
 };
 
 struct tpm_bios_log {
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index 3ee6883..495d316 100644
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -831,6 +831,9 @@ void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type)
 	struct tpm2_cmd cmd;
 	int rc;
 
+	if (chip->flags & TPM_CHIP_FLAG_NO_SHUTDOWN)
+		return;
+
 	cmd.header.in = tpm2_shutdown_header;
 	cmd.params.startup_in.startup_type = cpu_to_be16(shutdown_type);
 
diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
index 1d877cc..d439ce7 100644
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -573,7 +573,8 @@ static struct file *vtpm_proxy_create_device(
 	vtpm_proxy_fops_open(file);
 
 	if (proxy_dev->flags & VTPM_PROXY_FLAG_TPM2)
-		proxy_dev->chip->flags |= TPM_CHIP_FLAG_TPM2;
+		proxy_dev->chip->flags |= TPM_CHIP_FLAG_TPM2 |
+					  TPM_CHIP_FLAG_NO_SHUTDOWN;
 
 	vtpm_proxy_work_start(proxy_dev);
 
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2017-05-25 23:35 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-25 13:12 [PATCH] tpm: vtpm_proxy: Do not run tpm2_shutdown Stefan Berger
2017-05-25 13:12 ` Stefan Berger
2017-05-25 13:12 ` Stefan Berger
2017-05-25 15:50 ` Jason Gunthorpe
2017-05-25 15:50   ` Jason Gunthorpe
2017-05-25 15:50   ` Jason Gunthorpe
2017-05-25 20:04   ` Stefan Berger
2017-05-25 20:04     ` Stefan Berger
2017-05-25 20:09     ` Jason Gunthorpe
2017-05-25 20:09       ` Jason Gunthorpe
2017-05-25 20:32       ` Stefan Berger
2017-05-25 20:32         ` Stefan Berger
2017-05-25 20:44         ` Jason Gunthorpe
2017-05-25 20:44           ` Jason Gunthorpe
2017-05-25 20:44           ` Jason Gunthorpe
2017-05-25 20:54           ` Stefan Berger
2017-05-25 20:54             ` Stefan Berger
2017-05-25 20:54             ` Stefan Berger
2017-05-25 21:00             ` Jason Gunthorpe
2017-05-25 21:00               ` Jason Gunthorpe
2017-05-25 22:33         ` Jarkko Sakkinen
2017-05-25 22:33           ` Jarkko Sakkinen
2017-05-25 22:33           ` Jarkko Sakkinen
2017-05-25 23:34           ` Stefan Berger
2017-05-25 23:34             ` Stefan Berger
2017-05-25 23:34             ` Stefan Berger

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.