Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net/dccp: 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>
Acked-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c146fc9f

net/dccp/proto.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -473,14 +473,9 @@ static int dccp_setsockopt_ccid(struct sock *sk, int type, 
	if (optlen < 1 || optlen > DCCP_FEAT_MAX_SP_VALS)

	if (optlen < 1 || optlen > DCCP_FEAT_MAX_SP_VALS)

		return -EINVAL;

		return -EINVAL;





	val = kmalloc(optlen, GFP_KERNEL);

	val = memdup_user(optval, optlen);

	if (val == NULL)

	if (IS_ERR(val))

		return -ENOMEM;

		return PTR_ERR(val);



	if (copy_from_user(val, optval, optlen)) {

		kfree(val);

		return -EFAULT;

	}





	lock_sock(sk);

	lock_sock(sk);

	if (type == DCCP_SOCKOPT_TX_CCID || type == DCCP_SOCKOPT_CCID)

	if (type == DCCP_SOCKOPT_TX_CCID || type == DCCP_SOCKOPT_CCID)