KEYS: fix dereferencing NULL payload with nonzero length
authorEric Biggers <ebiggers@google.com>
Thu, 8 Jun 2017 13:48:40 +0000 (14:48 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 15 Sep 2017 17:30:52 +0000 (18:30 +0100)
commit134a3099ea5bb3d13126321ac48bfc48c72784ed
treec4a07c163e6632e7b231e91eb6ce9f82f1ca5138
parent84ffad0113bfd85b5f54be9c141bdd60d77d826a
KEYS: fix dereferencing NULL payload with nonzero length

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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
security/keys/keyctl.c