aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-21 18:20:26 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-31 03:24:13 -0400
commitc146fc9fc9bc1dc0f629fe83d49f32ab0f11bfdc (patch)
treec7cb7c247161c9409a7f65678aa18a4543de4c7c /drivers
parentc5dc9a3581f486a738f82a5317229d494d0f475f (diff)
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: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wan/sdla.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 43ae6f440bfb..e155938c4f82 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -1211,14 +1211,9 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
1211 } 1211 }
1212 else 1212 else
1213 { 1213 {
1214 temp = kmalloc(mem.len, GFP_KERNEL); 1214 temp = memdup_user(mem.data, mem.len);
1215 if (!temp) 1215 if (IS_ERR(temp))
1216 return(-ENOMEM); 1216 return PTR_ERR(temp);
1217 if(copy_from_user(temp, mem.data, mem.len))
1218 {
1219 kfree(temp);
1220 return -EFAULT;
1221 }
1222 sdla_write(dev, mem.addr, temp, mem.len); 1217 sdla_write(dev, mem.addr, temp, mem.len);
1223 kfree(temp); 1218 kfree(temp);
1224 } 1219 }