KEYS: Fix race between key destruction and finding a keyring by name
authorDavid Howells <dhowells@redhat.com>
Fri, 25 Sep 2015 15:30:08 +0000 (16:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Jan 2016 03:47:56 +0000 (19:47 -0800)
commitccc152bf4abb68e6d2c55091252f870bc4ee7a92
tree1ed7f8554d0c2934b9347bf1f80062170c0b0b9f
parent3a57e783016bf43ab9326172217f564941b85b17
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
security/keys/gc.c