Commit c5dc9a35 authored May 21, 2010 by Julia Lawall Committed by David S. Miller May 31, 2010

drivers/net/cxgb3: 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>

parent b23d00e9

drivers/net/cxgb3/cxgb3_main.c

+3 −9

Original line number	Original line	Diff line number	Diff line
	@@ -2311,15 +2311,9 @@ static int cxgb_extension_ioctl(struct net_device dev, void __user useraddr)
	if (copy_from_user(&t, useraddr, sizeof(t)))		if (copy_from_user(&t, useraddr, sizeof(t)))
	return -EFAULT;		return -EFAULT;
	/* Check t.len sanity ? */		/* Check t.len sanity ? */
	fw_data = kmalloc(t.len, GFP_KERNEL);		fw_data = memdup_user(useraddr + sizeof(t), t.len);
	if (!fw_data)		if (IS_ERR(fw_data))
	return -ENOMEM;		return PTR_ERR(fw_data);

	if (copy_from_user
	(fw_data, useraddr + sizeof(t), t.len)) {
	kfree(fw_data);
	return -EFAULT;
	}

	ret = t3_load_fw(adapter, fw_data, t.len);		ret = t3_load_fw(adapter, fw_data, t.len);
	kfree(fw_data);		kfree(fw_data);