From: David Jeffery Date: Thu, 12 Feb 2015 16:45:31 +0000 (+0000) Subject: Don't leak a key reference if request_key() tries to use a revoked keyring X-Git-Tag: v3.18.89~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd154dc611b343418d45753c3e101492a7ca13fa;p=thirdparty%2Fkernel%2Fstable.git Don't leak a key reference if request_key() tries to use a revoked keyring commit d0709f1e66e8066c4ac6a54620ec116aa41937c0 upstream. If a request_key() call to allocate and fill out a key attempts to insert the key structure into a revoked keyring, the key will leak, using memory and part of the user's key quota until the system reboots. This is from a failure of construct_alloc_key() to decrement the key's reference count after the attempt to insert into the requested keyring is rejected. key_put() needs to be called in the link_prealloc_failed callpath to ensure the unused key is released. Signed-off-by: David Jeffery Signed-off-by: David Howells Signed-off-by: James Morris Signed-off-by: Eric Biggers Signed-off-by: Greg Kroah-Hartman --- diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 6096be6232d7d..2e6eefda4f50f 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -437,6 +437,7 @@ link_check_failed: link_prealloc_failed: mutex_unlock(&user->cons_lock); + key_put(key); kleave(" = %d [prelink]", ret); return ret;