commit 58bac8cc3010ccb845572a3512fc16c9aaa5e50e
author Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Fri Jun 29 15:24:50 2018 +0300
committer Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Sat Jul 28 17:03:11 2018 +0300
tree 5ccd8ecaaae93054e587293bf2ac33244f922a02
parent eccc9bb844838b6b7a9691b31747416c4c34a83f

tpm: replace TPM_TRANSMIT_RAW with TPM_TRANSMIT_NESTED

As TPM_TRANSMIT_RAW always requires also not to take locks for obvious
reasons (deadlock), this commit renames the flag as TPM_TRANSMIT_NESTED
and prevents taking tpm_mutex when the flag is given to tpm_transmit().

Suggested-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

drivers/char/tpm/tpm_vtpm_proxy.c

diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
index e4f79f9..87a0ce4 100644
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -418,7 +418,7 @@ static int vtpm_proxy_request_locality(struct tpm_chip *chip, int locality)
 	proxy_dev->state |= STATE_DRIVER_COMMAND;
 
 	rc = tpm_transmit_cmd(chip, NULL, buf.data, tpm_buf_length(&buf), 0,
-			      TPM_TRANSMIT_UNLOCKED | TPM_TRANSMIT_RAW,
+			      TPM_TRANSMIT_NESTED,
 			      "attempting to set locality");
 
 	proxy_dev->state &= ~STATE_DRIVER_COMMAND;