]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
KEYS: encrypted: fix dereference of NULL user_key_payload
authorEric Biggers <ebiggers@google.com>
Mon, 9 Oct 2017 19:37:49 +0000 (12:37 -0700)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Wed, 1 Nov 2017 18:49:13 +0000 (16:49 -0200)
commitb2ba9c8ad3f4ebc968bf87e7779a82028d7911d9
tree7b938966b037c55c76b2b0467739493050d0b5d1
parent1584f4b8a005c12df1f8e19a3ddfadfc4f939adc
KEYS: encrypted: fix dereference of NULL user_key_payload

BugLink: http://bugs.launchpad.net/bugs/1729107
commit 13923d0865ca96312197962522e88bc0aedccd74 upstream.

A key of type "encrypted" references a "master key" which is used to
encrypt and decrypt the encrypted key's payload.  However, when we
accessed the master key's payload, we failed to handle the case where
the master key has been revoked, which sets the payload pointer to NULL.
Note that request_key() *does* skip revoked keys, but there is still a
window where the key can be revoked before we acquire its semaphore.

Fix it by checking for a NULL payload, treating it like a key which was
already revoked at the time it was requested.

This was an issue for master keys of type "user" only.  Master keys can
also be of type "trusted", but those cannot be revoked.

Fixes: 7e70cb497850 ("keys: add new key-type encrypted")
Reviewed-by: James Morris <james.l.morris@oracle.com>
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: David Safford <safford@us.ibm.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
security/keys/encrypted-keys/encrypted.c