]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'keys-fixes-20150107' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Jan 2015 21:52:16 +0000 (13:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Jan 2015 21:52:16 +0000 (13:52 -0800)
commitb05a388aeaafc720d7be994bb9e97959815be2ce
treedd36bc75c0c497621c0a276e9d96d05500e377f6
parent6155f3c63b27eed20f72a587c6e4a58b869112d5
parent8ccdc027147bbdf4f80ca1812b5e46d0ee01d8f9
Merge tag 'keys-fixes-20150107' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull keyrings fixes from David Howells:
 "Two fixes:

   - Fix for the order in which things are done during key garbage
     collection to prevent named keyrings causing a crash
     [CVE-2014-9529].

   - Fix assoc_array to explicitly #include rcupdate.h to prevent
     compilation errors under certain circumstances"

* tag 'keys-fixes-20150107' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  assoc_array: Include rcupdate.h for call_rcu() definition
  KEYS: close race between key lookup and freeing