redonkable
/
freescale-linux-fslc
1
0
Fork 0
Code Releases Activity

KEYS: trusted tpmdd-fixes on 20210422 

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.
 
 Signed-off-by: James E.J. Bottomley <jejb@linux.ibm.com>
 -----BEGIN PGP SIGNATURE-----
 
 iJwEABMIAEQWIQTnYEDbdso9F2cI+arnQslM7pishQUCYIGgCCYcamFtZXMuYm90
 dG9tbGV5QGhhbnNlbnBhcnRuZXJzaGlwLmNvbQAKCRDnQslM7pishec6AP94khAy
 a2Qm9aVa7k6zommZOcly2Vgxcq6SBDQyF7cWyQEAkVBZOpa9b8OyaK2lPS1CDJ5I
 avSlzMNYR2iXIArIIEU=
 =lY2e
 -----END PGP SIGNATURE-----

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
pull/326/head
Linus Torvalds 2021-04-22 13:51:46 -07:00
parent 16fc44d638 9d5171eab4
commit 90c911ad74
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/keys/trusted-keys/trusted_tpm2.c
View File

@ -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;