diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2018-11-04 21:01:42 +0300 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2019-02-13 10:48:28 +0300 |
| commit | 2f257402ee981720d65080b1e3ce19f693f5c9c3 (patch) | |
| tree | b4617b3fdc6682ba129f4f46bc8c21308d912030 /drivers/char/tpm/tpm-dev-common.c | |
| parent | 2677ca98ae377517930c183248221f69f771c921 (diff) | |
| download | linux-2f257402ee981720d65080b1e3ce19f693f5c9c3.tar.xz | |
tpm: remove TPM_TRANSMIT_UNLOCKED flag
Added locking as part of tpm_try_get_ops() and tpm_put_ops() as they are
anyway used in most of the call sites except in tpmrm_release() where we
take the locks manually.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Tested-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Tested-by: Alexander Steffen <Alexander.Steffen@infineon.com>
Diffstat (limited to 'drivers/char/tpm/tpm-dev-common.c')
| -rw-r--r-- | drivers/char/tpm/tpm-dev-common.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c index 95fe652b34ff..435c09ec9056 100644 --- a/drivers/char/tpm/tpm-dev-common.c +++ b/drivers/char/tpm/tpm-dev-common.c @@ -33,7 +33,6 @@ static ssize_t tpm_dev_transmit(struct tpm_chip *chip, struct tpm_space *space, struct tpm_header *header = (void *)buf; ssize_t ret, len; - mutex_lock(&chip->tpm_mutex); ret = tpm2_prepare_space(chip, space, buf, bufsiz); /* If the command is not implemented by the TPM, synthesize a * response with a TPM2_RC_COMMAND_CODE return for user-space. @@ -46,18 +45,16 @@ static ssize_t tpm_dev_transmit(struct tpm_chip *chip, struct tpm_space *space, ret = sizeof(*header); } if (ret) - goto out_lock; + goto out_rc; - len = tpm_transmit(chip, buf, bufsiz, TPM_TRANSMIT_UNLOCKED); + len = tpm_transmit(chip, buf, bufsiz, 0); if (len < 0) ret = len; if (!ret) ret = tpm2_commit_space(chip, space, buf, &len); -out_lock: - mutex_unlock(&chip->tpm_mutex); - +out_rc: return ret ? ret : len; } |