Skip to content

Commit

Permalink
KEYS: close race between key lookup and freeing
Browse files Browse the repository at this point in the history
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.

Change-Id: Ia69dbcf774f4a7db878281c1668a41e3413bde79
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
sashalevin authored and invisiblek committed Jan 6, 2015
1 parent d7e22be commit 50f45b8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions security/keys/gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,12 @@ static noinline void key_gc_unused_key(struct key *key)
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
Expand Down

0 comments on commit 50f45b8

Please sign in to comment.