Skip to content

Commit 90c911a

Browse files
committed
Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd
Pull tpm fix from James Bottomley: "This is an urgent regression fix for a tpm patch set that went in this merge window. It looks like a rebase before the original pull request lost a tpm_try_get_ops() so we have a lock imbalance in our code which is causing oopses. The original patch was correct on the mailing list. I'm sending this in agreement with Mimi (as joint maintainers of trusted keys) because Jarkko is off communing with the Reindeer or whatever it is Finns do when on holiday" * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd: KEYS: trusted: Fix TPM reservation for seal/unseal
2 parents 16fc44d + 9d5171e commit 90c911a

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

security/keys/trusted-keys/trusted_tpm2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip,
7979
if (i == ARRAY_SIZE(tpm2_hash_map))
8080
return -EINVAL;
8181

82-
rc = tpm_buf_init(&buf, TPM2_ST_SESSIONS, TPM2_CC_CREATE);
82+
rc = tpm_try_get_ops(chip);
8383
if (rc)
8484
return rc;
8585

0 commit comments

Comments
 (0)