linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] KEYS: fix dereferencing NULL payload with nonzero length
@ 2017-04-01 21:34 Eric Biggers
  2017-04-03 15:46 ` David Howells
  2017-04-17  6:26 ` [lkp-robot] [KEYS] bdf7c0f8bf: ltp.add_key02.fail kernel test robot
  0 siblings, 2 replies; 11+ messages in thread
From: Eric Biggers @ 2017-04-01 21:34 UTC (permalink / raw)
  To: keyrings
  Cc: David Howells, linux-security-module, linux-kernel, Eric Biggers, stable

From: Eric Biggers <ebiggers@google.com>

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.

Cc: stable@vger.kernel.org # 2.6.10+
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 security/keys/keyctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 52c34532c785..57447cd29154 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -99,7 +99,7 @@ SYSCALL_DEFINE5(add_key, const char __user *, _type,
 	/* pull the payload in if one was supplied */
 	payload = NULL;
 
-	if (_payload) {
+	if (plen) {
 		ret = -ENOMEM;
 		payload = kmalloc(plen, GFP_KERNEL | __GFP_NOWARN);
 		if (!payload) {
@@ -324,7 +324,7 @@ long keyctl_update_key(key_serial_t id,
 
 	/* pull the payload in if one was supplied */
 	payload = NULL;
-	if (_payload) {
+	if (plen) {
 		ret = -ENOMEM;
 		payload = kmalloc(plen, GFP_KERNEL);
 		if (!payload)
-- 
2.12.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-06-02 13:43 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-01 21:34 [PATCH] KEYS: fix dereferencing NULL payload with nonzero length Eric Biggers
2017-04-03 15:46 ` David Howells
2017-04-03 17:59   ` Eric Biggers
2017-04-03 19:20   ` David Howells
2017-04-03 21:30     ` Eric Biggers
2017-05-31 19:11       ` Eric Biggers
2017-04-17  6:26 ` [lkp-robot] [KEYS] bdf7c0f8bf: ltp.add_key02.fail kernel test robot
2017-04-17 17:29   ` Eric Biggers
2017-04-20 12:57     ` [LTP] " Cyril Hrubis
2017-04-21  4:43       ` Eric Biggers
2017-06-02 13:43       ` David Howells

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).