提交 16dff918 编写于 作者: J Julia Lawall 提交者: David S. Miller

net/can: 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: NJulia Lawall <julia@diku.dk>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 d7fd1b57
...@@ -436,14 +436,9 @@ static int raw_setsockopt(struct socket *sock, int level, int optname, ...@@ -436,14 +436,9 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
if (count > 1) { if (count > 1) {
/* filter does not fit into dfilter => alloc space */ /* filter does not fit into dfilter => alloc space */
filter = kmalloc(optlen, GFP_KERNEL); filter = memdup_user(optval, optlen);
if (!filter) if (IS_ERR(filter))
return -ENOMEM; return PTR_ERR(filter);
if (copy_from_user(filter, optval, optlen)) {
kfree(filter);
return -EFAULT;
}
} else if (count == 1) { } else if (count == 1) {
if (copy_from_user(&sfilter, optval, sizeof(sfilter))) if (copy_from_user(&sfilter, optval, sizeof(sfilter)))
return -EFAULT; return -EFAULT;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册