]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
KEYS: fix dereferencing NULL payload with nonzero length
authorEric Biggers <ebiggers@google.com>
Thu, 8 Jun 2017 13:48:40 +0000 (14:48 +0100)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Tue, 27 Jun 2017 13:16:23 +0000 (10:16 -0300)
commit63ee44665635354edf9e52e65c9d95b8941c64e8
treeab4eeb37b0f788a8aa30e1b2271f541489a1bde3
parent0394889d585fe142bf7730f69819145cef9ac633
KEYS: fix dereferencing NULL payload with nonzero length

BugLink: http://bugs.launchpad.net/bugs/1698799
commit 5649645d725c73df4302428ee4e02c869248b4c5 upstream.

sys_add_key() and the KEYCTL_UPDATE operation of sys_keyctl() allowed a
NULL payload with nonzero length to be passed to the key type's
->preparse(), ->instantiate(), and/or ->update() methods.  Various key
types including asymmetric, cifs.idmap, cifs.spnego, and pkcs7_test did
not handle this case, allowing an unprivileged user to trivially cause a
NULL pointer dereference (kernel oops) if one of these key types was
present.  Fix it by doing the copy_from_user() when 'plen' is nonzero
rather than when '_payload' is non-NULL, causing the syscall to fail
with EFAULT as expected when an invalid buffer is specified.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
security/keys/keyctl.c