]> www.infradead.org Git - users/hch/misc.git/commitdiff
Merge tag 'keys-next-6.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkk...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Nov 2024 19:29:15 +0000 (09:29 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Nov 2024 19:29:15 +0000 (09:29 -1000)
Pull keys fixes from Jarkko Sakkinen:
 "A couple of fixes for keys and trusted keys"

* tag 'keys-next-6.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  KEYS: trusted: dcp: fix NULL dereference in AEAD crypto operation
  security/keys: fix slab-out-of-bounds in key_task_permission


Trivial merge