Commit d0709f1e authored by David Jeffery's avatar David Jeffery Committed by James Morris

Don't leak a key reference if request_key() tries to use a revoked keyring

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: default avatarDavid Jeffery <djeffery@redhat.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent cd07db5f
...@@ -414,6 +414,7 @@ static int construct_alloc_key(struct keyring_search_context *ctx, ...@@ -414,6 +414,7 @@ static int construct_alloc_key(struct keyring_search_context *ctx,
link_prealloc_failed: link_prealloc_failed:
mutex_unlock(&user->cons_lock); mutex_unlock(&user->cons_lock);
key_put(key);
kleave(" = %d [prelink]", ret); kleave(" = %d [prelink]", ret);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment