]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'keys-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Oct 2015 07:09:36 +0000 (16:09 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Oct 2015 07:09:36 +0000 (16:09 +0900)
commitce1fad2740c648a4340f6f6c391a8a83769d2e8c
tree8d19a392845cae4ca37639ace41105c34a7b20d1
parent1099f86044111e9a7807f09523e42d4c9d0fb781
parent911b79cde95c7da0ec02f48105358a36636b7a71
Merge branch 'keys-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull key handling fixes from David Howells:
 "Here are two patches, the first of which at least should go upstream
  immediately:

  (1) Prevent a user-triggerable crash in the keyrings destructor when a
      negatively instantiated keyring is garbage collected.  I have also
      seen this triggered for user type keys.

  (2) Prevent the user from using requesting that a keyring be created
      and instantiated through an upcall.  Doing so is probably safe
      since the keyring type ignores the arguments to its instantiation
      function - but we probably shouldn't let keyrings be created in
      this manner"

* 'keys-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  KEYS: Don't permit request_key() to construct a new keyring
  KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring