Skip to content

Commit

Permalink
Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/je…
Browse files Browse the repository at this point in the history
…jb/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
  • Loading branch information
Linus Torvalds committed Apr 22, 2021
2 parents 16fc44d + 9d5171e commit 90c911a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion security/keys/trusted-keys/trusted_tpm2.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip,
if (i == ARRAY_SIZE(tpm2_hash_map))
return -EINVAL;

rc = tpm_buf_init(&buf, TPM2_ST_SESSIONS, TPM2_CC_CREATE);
rc = tpm_try_get_ops(chip);
if (rc)
return rc;

Expand Down

0 comments on commit 90c911a

Please sign in to comment.