Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-2
+1
lib/assoc_array.c
+1
lib/assoc_array.c
+2
-2
security/keys/gc.c
+2
-2
security/keys/gc.c
···
148
148
if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags))
149
149
atomic_dec(&key->user->nikeys);
150
150
151
-
key_user_put(key->user);
152
-
153
151
/* now throw away the key memory */
154
152
if (key->type->destroy)
155
153
key->type->destroy(key);
154
+
155
+
key_user_put(key->user);
156
156
157
157
kfree(key->description);
158
158