Commit 7836a2d9 authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds

rapidio/rio_cm: use memdup_user() instead of duplicating code

Fix coccinelle warning about duplicating existing memdup_user function.

Link: http://lkml.kernel.org/r/20160811151737.20140-1-alexandre.bounine@idt.com
Link: https://lkml.org/lkml/2016/8/11/29Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com>
Cc: Barry Wood <barry.wood@idt.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0a5bf409
...@@ -1841,24 +1841,19 @@ static int cm_chan_msg_send(void __user *arg) ...@@ -1841,24 +1841,19 @@ static int cm_chan_msg_send(void __user *arg)
{ {
struct rio_cm_msg msg; struct rio_cm_msg msg;
void *buf; void *buf;
int ret = 0; int ret;
if (copy_from_user(&msg, arg, sizeof(msg))) if (copy_from_user(&msg, arg, sizeof(msg)))
return -EFAULT; return -EFAULT;
if (msg.size > RIO_MAX_MSG_SIZE) if (msg.size > RIO_MAX_MSG_SIZE)
return -EINVAL; return -EINVAL;
buf = kmalloc(msg.size, GFP_KERNEL); buf = memdup_user((void __user *)(uintptr_t)msg.msg, msg.size);
if (!buf) if (IS_ERR(buf))
return -ENOMEM; return PTR_ERR(buf);
if (copy_from_user(buf, (void __user *)(uintptr_t)msg.msg, msg.size)) {
ret = -EFAULT;
goto out;
}
ret = riocm_ch_send(msg.ch_num, buf, msg.size); ret = riocm_ch_send(msg.ch_num, buf, msg.size);
out:
kfree(buf); kfree(buf);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment