KEYS: fix key refcount leak in keyctl_assume_authority()
authorEric Biggers <ebiggers@google.com>
Mon, 18 Sep 2017 18:36:12 +0000 (11:36 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 1 Jan 2018 20:50:52 +0000 (20:50 +0000)
commit4955da6650a89d4c9ea194dbfbe9ae5ae52f52e1
treeed8aa14de32e730877bae2e418b8d575e352c94c
parent9e9039264036f9d1213920150f7db680c385aaf8
KEYS: fix key refcount leak in keyctl_assume_authority()

commit 884bee0215fcc239b30c062c37ca29077005e064 upstream.

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
security/keys/keyctl.c