Commit e642df6a authored May 22, 2010 by Julia Lawall Committed by Roland Dreier May 25, 2010

IB/ucm: 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>

parent ec96e2fe

drivers/infiniband/core/ucm.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -706,14 +706,9 @@ static int ib_ucm_alloc_data(const void **dest, u64 src, u32 len)
		if (!len)
		return 0;

		data = kmalloc(len, GFP_KERNEL);
		if (!data)
		return -ENOMEM;

		if (copy_from_user(data, (void __user *)(unsigned long)src, len)) {
		kfree(data);
		return -EFAULT;
		}
		data = memdup_user((void __user *)(unsigned long)src, len);
		if (IS_ERR(data))
		return PTR_ERR(data);

		*dest = data;
		return 0;

Admin message