summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorDavid Jeffery <djeffery@redhat.com>2015-02-12 19:45:31 +0300
committerJiri Slaby <jslaby@suse.cz>2015-04-09 14:14:24 +0300
commitda95a0de5c59732c942e9753ecc9c03c3783d33d (patch)
tree4d8b09fc7d4dc208445383207aec95e0a7508ca8 /security
parentc4b022d10d4a79badf377d6229258dc390598325 (diff)
downloadlinux-da95a0de5c59732c942e9753ecc9c03c3783d33d.tar.xz
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 <djeffery@redhat.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <james.l.morris@oracle.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'security')
-rw-r--r--security/keys/request_key.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index c411f9bb156b..5678616cde9d 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -432,6 +432,7 @@ link_check_failed:
link_prealloc_failed:
mutex_unlock(&user->cons_lock);
+ key_put(key);
kleave(" = %d [prelink]", ret);
return ret;