drivers/net/wan: Use memdup_user
authorJulia Lawall <julia@diku.dk>
Fri, 21 May 2010 22:20:26 +0000 (22:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 May 2010 07:24:13 +0000 (00:24 -0700)
Use memdup_user when user data is immediately copied into the
allocated region.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression from,to,size,flag;
position p;
identifier l1,l2;
@@

-  to = \(kmalloc@p\|kzalloc@p\)(size,flag);
+  to = memdup_user(from,size);
   if (
-      to==NULL
+      IS_ERR(to)
                 || ...) {
   <+... when != goto l1;
-  -ENOMEM
+  PTR_ERR(to)
   ...+>
   }
-  if (copy_from_user(to, from, size) != 0) {
-    <+... when != goto l2;
-    -EFAULT
-    ...+>
-  }
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wan/sdla.c

index 43ae6f440bfb179fbc4ee3ec59d20dfdd0a38331..e155938c4f82823588798942376b0317b11318f5 100644 (file)
@@ -1211,14 +1211,9 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
        }
        else
        {
-               temp = kmalloc(mem.len, GFP_KERNEL);
-               if (!temp)
-                       return(-ENOMEM);
-               if(copy_from_user(temp, mem.data, mem.len))
-               {
-                       kfree(temp);
-                       return -EFAULT;
-               }
+               temp = memdup_user(mem.data, mem.len);
+               if (IS_ERR(temp))
+                       return PTR_ERR(temp);
                sdla_write(dev, mem.addr, temp, mem.len);
                kfree(temp);
        }