[GIT PULL] KEYS: trusted fixes for 5.12-rc7

[GIT PULL] KEYS: trusted fixes for 5.12-rc7

[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.

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd.git fixes

The short changelog is:

James Bottomley (1):
      KEYS: trusted: Fix TPM reservation for seal/unseal

And the diffstat:

 security/keys/trusted-keys/trusted_tpm2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

With full diff below.

James

---

diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c
index e2a0ed5d02f0..c87c4df8703d 100644
--- a/security/keys/trusted-keys/trusted_tpm2.c
+++ b/security/keys/trusted-keys/trusted_tpm2.c
@@ -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;
 

Re: [GIT PULL] KEYS: trusted fixes for 5.12-rc7

[Linus Torvalds]

On Thu, Apr 22, 2021 at 1:26 PM James Bottomley
<James.Bottomley@hansenpartnership.com> wrote:
>
> 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.

"Communing with Reindeer" is unlikely except possibly as a euphemism
for "drinking".

The traditional Finnish thing would be to go to a small cottage by a
lake ("mökki") and relax while fishing, going to the sauna, and just
getting away from it all.

But whether that's what Jarkko does, who knows? It's not quite the
season for lake cottages yet - April in Finland is not generally the
most pleasant weather...

Pulled.

          Linus

Re: [GIT PULL] KEYS: trusted fixes for 5.12-rc7

[pr-tracker-bot]

The pull request you sent on Thu, 22 Apr 2021 13:26:48 -0700:

> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd.git fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/90c911ad7445ccec9936763f05fa5db6a3da53be

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html