From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 May 2024 17:04:02 +0000 (-0700)
Subject: Merge tag 'keys-trusted-next-6.10-rc1-part2' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: io_uring-6.10-20240523~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fa8151cabfaa4166feeb6e8a4df428d7c3d9fecd;p=linux-2.6-block.git

Merge tag 'keys-trusted-next-6.10-rc1-part2' of git://git./linux/kernel/git/jarkko/linux-tpmdd

Pull trusted keys fixes from Jarkko Sakkinen:
 "These are two bugs I found from trusted keys while working on a new
  RSA key type for TPM2. Both originate form v5.13.

  The memory leak is more crucial but I don't think it is either good
  idea if kernel throws WARN when ASN.1 parser fails, even if it is
  related to programming error, as it is not that mature code yet.

  There's at least two WARN's in that code but I picked just the one
  more likely to trigger. Planning to fix the other one too over time"

* tag 'keys-trusted-next-6.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  KEYS: trusted: Do not use WARN when encode fails
  KEYS: trusted: Fix memory leak in tpm2_key_encode()
---

fa8151cabfaa4166feeb6e8a4df428d7c3d9fecd