Commit b23d00e9 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

drivers/net: 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 16dff918
...@@ -538,14 +538,9 @@ static int get_filter(void __user *arg, struct sock_filter **p) ...@@ -538,14 +538,9 @@ static int get_filter(void __user *arg, struct sock_filter **p)
} }
len = uprog.len * sizeof(struct sock_filter); len = uprog.len * sizeof(struct sock_filter);
code = kmalloc(len, GFP_KERNEL); code = memdup_user(uprog.filter, len);
if (code == NULL) if (IS_ERR(code))
return -ENOMEM; return PTR_ERR(code);
if (copy_from_user(code, uprog.filter, len)) {
kfree(code);
return -EFAULT;
}
err = sk_chk_filter(code, uprog.len); err = sk_chk_filter(code, uprog.len);
if (err) { if (err) {
......
Supports Markdown
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