diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2014-12-29 17:39:01 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-01-29 17:45:09 +0300 |
| commit | 1bb0aca1e0881dfd34a6f39fd44e1e995fc302a1 (patch) | |
| tree | 9fb9640abd1491f7bd7c2ac27a9d3b252cab27bb /security | |
| parent | ad9f4ac8dfc8437f97ee35df7ecfbb62c8ebaee9 (diff) | |
| download | linux-1bb0aca1e0881dfd34a6f39fd44e1e995fc302a1.tar.xz | |
KEYS: close race between key lookup and freeing
commit a3a8784454692dd72e5d5d34dcdab17b4420e74c upstream.
When a key is being garbage collected, it's key->user would get put before
the ->destroy() callback is called, where the key is removed from it's
respective tracking structures.
This leaves a key hanging in a semi-invalid state which leaves a window open
for a different task to try an access key->user. An example is
find_keyring_by_name() which would dereference key->user for a key that is
in the process of being garbage collected (where key->user was freed but
->destroy() wasn't called yet - so it's still present in the linked list).
This would cause either a panic, or corrupt memory.
Fixes CVE-2014-9529.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/gc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/gc.c b/security/keys/gc.c index d67c97bb1025..797818695c87 100644 --- a/security/keys/gc.c +++ b/security/keys/gc.c @@ -201,12 +201,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 |