diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-08 13:52:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-08 13:52:16 -0800 |
| commit | 086b2a942e794a03e5ea7503f45f2353559b5a3e (patch) | |
| tree | dd36bc75c0c497621c0a276e9d96d05500e377f6 | |
| parent | b11ecb2785b94e931b445fc0ae3e7447e16b2c49 (diff) | |
| parent | 990428b8ead311c68a850ead7ec8557a10b8893a (diff) | |
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
| -rw-r--r-- | lib/assoc_array.c | 1 | ||||
| -rw-r--r-- | security/keys/gc.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/assoc_array.c b/lib/assoc_array.c index 2404d03e251..03dd576e677 100644 --- a/lib/assoc_array.c +++ b/lib/assoc_array.c @@ -11,6 +11,7 @@ * 2 of the Licence, or (at your option) any later version. */ //#define DEBUG +#include <linux/rcupdate.h> #include <linux/slab.h> #include <linux/err.h> #include <linux/assoc_array_priv.h> diff --git a/security/keys/gc.c b/security/keys/gc.c index 9609a7f0fae..c7952375ac5 100644 --- a/security/keys/gc.c +++ b/security/keys/gc.c @@ -148,12 +148,12 @@ static noinline void key_gc_unused_keys(struct list_head *keys) if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags)) atomic_dec(&key->user->nikeys); - key_user_put(key->user); - /* now throw away the key memory */ if (key->type->destroy) key->type->destroy(key); + key_user_put(key->user); + kfree(key->description); #ifdef KEY_DEBUGGING |