Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1386165

[PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling tpm2_shutdown()

From Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Newsgroups linux.kernel
Subject [PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling tpm2_shutdown()
Date 2016-04-25 11:30 +0200
Message-ID <rrL05-3oi-3@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw


Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reported-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 drivers/char/tpm/tpm-chip.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index a12db8e..1965dc7 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -270,7 +270,8 @@ static void tpm_del_char_device(struct tpm_chip *chip)
 
 	/* Make the driver uncallable. */
 	down_write(&chip->ops_sem);
-	tpm2_shutdown(chip, TPM2_SU_CLEAR);
+	if (chip->flags & TPM_CHIP_FLAG_TPM2)
+		tpm2_shutdown(chip, TPM2_SU_CLEAR);
 	chip->ops = NULL;
 	up_write(&chip->ops_sem);
 }
-- 
2.7.4

Back to linux.kernel | Previous | NextNext in thread | Find similar | Unroll thread


Thread

[PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling tpm2_shutdown() Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-04-25 11:30 +0200
  Re: [PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling  tpm2_shutdown() Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-04-25 20:00 +0200
    Re: [PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling  tpm2_shutdown() Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-04-25 20:50 +0200
    Re: [PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling  tpm2_shutdown() Stefan Berger <stefanb@linux.vnet.ibm.com> - 2016-04-25 21:10 +0200

csiph-web