commit 086b2a942e794a03e5ea7503f45f2353559b5a3e
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 08 13:52:16 2015 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 08 13:52:16 2015 -0800
tree dd36bc75c0c497621c0a276e9d96d05500e377f6
parent b11ecb2785b94e931b445fc0ae3e7447e16b2c49
parent 990428b8ead311c68a850ead7ec8557a10b8893a

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