diff options
| author | David Howells <dhowells@redhat.com> | 2015-09-25 16:30:08 +0100 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-03-21 09:17:55 +0800 |
| commit | 48ec02cc771de41cc8b063a2f60890242c09bfba (patch) | |
| tree | d90655f4944980f32082aa257baf78d46c64ca77 /security | |
| parent | 04d6387f6f3f1727abd3e8f77686efd125c5f691 (diff) | |
KEYS: Fix race between key destruction and finding a keyring by name
commit 94c4554ba07adbdde396748ee7ae01e86cf2d8d7 upstream.
There appears to be a race between:
(1) key_gc_unused_keys() which frees key->security and then calls
keyring_destroy() to unlink the name from the name list
(2) find_keyring_by_name() which calls key_permission(), thus accessing
key->security, on a key before checking to see whether the key usage is 0
(ie. the key is dead and might be cleaned up).
Fix this by calling ->destroy() before cleaning up the core key data -
including key->security.
Reported-by: Petr Matousek <pmatouse@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
[lizf: Backported to 3.4: adjust indentation]
Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/gc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/keys/gc.c b/security/keys/gc.c index 87632bd17b3e..f85d6381c06e 100644 --- a/security/keys/gc.c +++ b/security/keys/gc.c @@ -174,6 +174,10 @@ static noinline void key_gc_unused_key(struct key *key) { key_check(key); + /* Throw away the key data */ + if (key->type->destroy) + key->type->destroy(key); + security_key_free(key); /* deal with the user's key tracking and quota */ @@ -188,10 +192,6 @@ static noinline void key_gc_unused_key(struct key *key) if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags)) atomic_dec(&key->user->nikeys); - /* now throw away the key memory */ - if (key->type->destroy) - key->type->destroy(key); - key_user_put(key->user); kfree(key->description); |