tpm: check for TPM_CHIP_FLAG_TPM2 before calling tpm2_shutdown()

Jarkko Sakkinen · Jarkko Sakkinen · commit 01fc5e85e8f5 · 2016-04-26T09:44:47.000+03:00
Fixes: 20e0152 ("tpm: fix crash in tpm_tis deinitialization") Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Reported-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-By: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
@@ -269,7 +269,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);
 }

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,8 @@ static void tpm_del_char_device(struct tpm_chip *chip)`
`269`	`269`
`270`	`270`	`/* Make the driver uncallable. */`
`271`	`271`	`down_write(&chip->ops_sem);`
`272`		`- tpm2_shutdown(chip, TPM2_SU_CLEAR);`
	`272`	`+ if (chip->flags & TPM_CHIP_FLAG_TPM2)`
	`273`	`+ tpm2_shutdown(chip, TPM2_SU_CLEAR);`
`273`	`274`	`chip->ops = NULL;`
`274`	`275`	`up_write(&chip->ops_sem);`
`275`	`276`	`}`