summaryrefslogtreecommitdiff
path: root/security/integrity
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-10-09 12:46:18 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-27 10:23:18 +0200
commit1dda04c761abf006402f7f5e9adb11f9044731c8 (patch)
treeeb12ca5d1222346129ae3491e50ae0d3cfe5de58 /security/integrity
parent7d9e13d953f2a3029d8b26a6f9a7dae83a4594ae (diff)
fscrypt: fix dereference of NULL user_key_payload
commit d60b5b7854c3d135b869f74fb93eaf63cbb1991a upstream. When an fscrypt-encrypted file is opened, we request the file's master key from the keyrings service as a logon key, then access its payload. However, a revoked key has a NULL payload, and we failed to check for this. 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. Fixes: 88bd6ccdcdd6 ("ext4 crypto: add encryption key management facilities") Reviewed-by: James Morris <james.l.morris@oracle.com> Cc: <stable@vger.kernel.org> [v4.1+] 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>
Diffstat (limited to 'security/integrity')
0 files changed, 0 insertions, 0 deletions