[PATCH] KEYS: use memdup_user

From	Geliang Tang <geliangtang@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] KEYS: use memdup_user
Date	2017-05-13 05:20 +0200
Message-ID	<tGvL4-6mY-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Use memdup_user() helper instead of open-coding to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 security/keys/keyctl.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index dd0da25..ce1574a 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -326,14 +326,11 @@ long keyctl_update_key(key_serial_t id,
 	/* pull the payload in if one was supplied */
 	payload = NULL;
 	if (_payload) {
-		ret = -ENOMEM;
-		payload = kmalloc(plen, GFP_KERNEL);
-		if (!payload)
+		payload = memdup_user(_payload, plen);
+		if (IS_ERR(payload)) {
+			ret = PTR_ERR(payload);
 			goto error;
-
-		ret = -EFAULT;
-		if (copy_from_user(payload, _payload, plen) != 0)
-			goto error2;
+		}
 	}
 
 	/* find the target key (which must be writable) */
-- 
2.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] KEYS: use memdup_user Geliang Tang <geliangtang@gmail.com> - 2017-05-13 05:20 +0200
  [PATCH] usb: gadget: f_fs: use memdup_user Geliang Tang <geliangtang@gmail.com> - 2017-05-13 05:20 +0200
    Re: [PATCH] usb: gadget: f_fs: use memdup_user Dan Carpenter <dan.carpenter@oracle.com> - 2017-05-13 10:10 +0200
      Re: [PATCH] usb: gadget: f_fs: use memdup_user Al Viro <viro@ZenIV.linux.org.uk> - 2017-05-21 05:30 +0200
    Re: [PATCH] usb: gadget: f_fs: use memdup_user Michal Nazarewicz <mina86@mina86.com> - 2017-05-14 13:40 +0200

csiph-web