diff options
| author | Roberto Sassu <roberto.sassu@huawei.com> | 2019-09-13 20:51:36 +0200 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2019-09-25 02:43:53 +0300 |
| commit | 9f75c82246313d4c2a6bc77e947b45655b3b5ad5 (patch) | |
| tree | 321a5a52f90cd7fb6a9beabdd8ab596c4026cdb3 /security | |
| parent | 34cd83bb8a468b24d9a13adbfb5ad645c552b8e2 (diff) | |
| download | linux-9f75c82246313d4c2a6bc77e947b45655b3b5ad5.tar.gz linux-9f75c82246313d4c2a6bc77e947b45655b3b5ad5.tar.bz2 linux-9f75c82246313d4c2a6bc77e947b45655b3b5ad5.zip | |
KEYS: trusted: correctly initialize digests and fix locking issue
Commit 0b6cf6b97b7e ("tpm: pass an array of tpm_extend_digest structures to
tpm_pcr_extend()") modifies tpm_pcr_extend() to accept a digest for each
PCR bank. After modification, tpm_pcr_extend() expects that digests are
passed in the same order as the algorithms set in chip->allocated_banks.
This patch fixes two issues introduced in the last iterations of the patch
set: missing initialization of the TPM algorithm ID in the tpm_digest
structures passed to tpm_pcr_extend() by the trusted key module, and
unreleased locks in the TPM driver due to returning from tpm_pcr_extend()
without calling tpm_put_ops().
Cc: stable@vger.kernel.org
Fixes: 0b6cf6b97b7e ("tpm: pass an array of tpm_extend_digest structures to tpm_pcr_extend()")
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/trusted.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/keys/trusted.c b/security/keys/trusted.c index ade699131065..1fbd77816610 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted.c @@ -1228,11 +1228,16 @@ hashalg_fail: static int __init init_digests(void) { + int i; + digests = kcalloc(chip->nr_allocated_banks, sizeof(*digests), GFP_KERNEL); if (!digests) return -ENOMEM; + for (i = 0; i < chip->nr_allocated_banks; i++) + digests[i].alg_id = chip->allocated_banks[i].alg_id; + return 0; } |