diff options
| author | David Jeffery <djeffery@redhat.com> | 2015-02-12 16:45:31 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-20 10:01:28 +0100 |
| commit | bd154dc611b343418d45753c3e101492a7ca13fa (patch) | |
| tree | ee36f33820d3e3f551051ac5409d20d7e8fd0c5a /security | |
| parent | 66d63dc137c9b04cf1b9a3102ce79ca15b139764 (diff) | |
| download | linux-stable-bd154dc611b343418d45753c3e101492a7ca13fa.tar.gz linux-stable-bd154dc611b343418d45753c3e101492a7ca13fa.tar.bz2 linux-stable-bd154dc611b343418d45753c3e101492a7ca13fa.zip | |
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: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/request_key.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 6096be6232d7..2e6eefda4f50 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; |