]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: use memdup_user
authorHari Prasath Gujulan Elango <hgujulan@visteon.com>
Thu, 11 Jun 2015 07:48:13 +0000 (07:48 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Jun 2015 16:11:32 +0000 (09:11 -0700)
This patch replaces the kmalloc followed by copy_from_user by the
wrapper routine memdup_user.

Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_wlan.c

index 3aa9a4b6b4f0ba2341030116acec0d98ce4edf3b..387d4ecc2f2c67f17a815b14e9eff1d55735d02e 100644 (file)
@@ -2459,16 +2459,10 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
                size = wrq->u.data.length;
 
                if (size && wrq->u.data.pointer) {
-                       buff = kmalloc(size, GFP_KERNEL);
-                       if (!buff) {
-                               s32Error = -ENOMEM;
-                               goto done;
-                       }
 
-                       if (copy_from_user
-                                   (buff, wrq->u.data.pointer,
-                                   wrq->u.data.length)) {
-                               s32Error = -EFAULT;
+                       buff = memdup_user(wrq->u.data.pointer, wrq->u.data.length);
+                       if (IS_ERR(buff)) {
+                               s32Error = PTR_ERR(buff);
                                goto done;
                        }