path: root/security/keys/keyctl.c
diff options
authorEric Biggers <ebiggers@google.com>2017-09-18 11:36:12 -0700
committerDavid Howells <dhowells@redhat.com>2017-09-25 15:19:57 +0100
commit884bee0215fcc239b30c062c37ca29077005e064 (patch)
treee74b9a72d9bdffcc459d8a0393a6f908ef4d213a /security/keys/keyctl.c
parentKEYS: don't revoke uninstantiated key in request_key_auth_new() (diff)
KEYS: fix key refcount leak in keyctl_assume_authority()
In keyctl_assume_authority(), if keyctl_change_reqkey_auth() were to fail, we would leak the reference to the 'authkey'. Currently this can only happen if prepare_creds() fails to allocate memory. But it still should be fixed, as it is a more severe bug waiting to happen. This patch also moves the read of 'authkey->serial' to before the reference to the authkey is dropped. Doing the read after dropping the reference is very fragile because it assumes we still hold another reference to the key. (Which we do, in current->cred->request_key_auth, but there's no reason not to write it in the "obviously correct" way.) Fixes: d84f4f992cbd ("CRED: Inaugurate COW credentials") Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to '')
1 files changed, 2 insertions, 4 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index ab0b337c84b4..562f7fe287a0 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1406,11 +1406,9 @@ long keyctl_assume_authority(key_serial_t id)
ret = keyctl_change_reqkey_auth(authkey);
- if (ret < 0)
- goto error;
+ if (ret == 0)
+ ret = authkey->serial;
- ret = authkey->serial;
return ret;