Commit 45de4327 authored by Cristina Opriceana's avatar Cristina Opriceana Committed by Greg Kroah-Hartman

Staging: rtl8712: Use memdup_user() instead of copy_from_user()

Use memdup_user() to avoid its duplicated implementation and simplify
code. memdup_user() uses GFP_KERNEL instead of GFP_ATOMIC,
which is valid because copy_from_user() might sleep and it's useless
to make the allocation atomic. Found with coccinelle.
Signed-off-by: default avatarCristina Opriceana <cristina.opriceana@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66687e6a
...@@ -1912,13 +1912,9 @@ static int r871x_mp_ioctl_hdl(struct net_device *dev, ...@@ -1912,13 +1912,9 @@ static int r871x_mp_ioctl_hdl(struct net_device *dev,
bset = (u8)(p->flags & 0xFFFF); bset = (u8)(p->flags & 0xFFFF);
len = p->length; len = p->length;
pparmbuf = NULL; pparmbuf = NULL;
pparmbuf = kmalloc(len, GFP_ATOMIC); pparmbuf = memdup_user(p->pointer, len);
if (pparmbuf == NULL) { if (IS_ERR(pparmbuf)) {
ret = -ENOMEM; ret = PTR_ERR(pparmbuf);
goto _r871x_mp_ioctl_hdl_exit;
}
if (copy_from_user(pparmbuf, p->pointer, len)) {
ret = -EFAULT;
goto _r871x_mp_ioctl_hdl_exit; goto _r871x_mp_ioctl_hdl_exit;
} }
poidparam = (struct mp_ioctl_param *)pparmbuf; poidparam = (struct mp_ioctl_param *)pparmbuf;
......
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