Commit c146fc9f authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller

drivers/net/wan: Use memdup_user

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5dc9a35
...@@ -1211,14 +1211,9 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r ...@@ -1211,14 +1211,9 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
} }
else else
{ {
temp = kmalloc(mem.len, GFP_KERNEL); temp = memdup_user(mem.data, mem.len);
if (!temp) if (IS_ERR(temp))
return(-ENOMEM); return PTR_ERR(temp);
if(copy_from_user(temp, mem.data, mem.len))
{
kfree(temp);
return -EFAULT;
}
sdla_write(dev, mem.addr, temp, mem.len); sdla_write(dev, mem.addr, temp, mem.len);
kfree(temp); kfree(temp);
} }
......
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