Commit a906b060 authored May 22, 2010 by Julia Lawall Committed by John W. Linville Jun 02, 2010

drivers/net/wireless/prism54: 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: John W. Linville <linville@tuxdriver.com>

parent b7b1b512

drivers/net/wireless/prism54/isl_ioctl.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -2751,14 +2751,9 @@ prism54_hostapd(struct net_device ndev, struct iw_point p)
		p->length > PRISM2_HOSTAPD_MAX_BUF_SIZE \|\| !p->pointer)
		return -EINVAL;

		param = kmalloc(p->length, GFP_KERNEL);
		if (param == NULL)
		return -ENOMEM;

		if (copy_from_user(param, p->pointer, p->length)) {
		kfree(param);
		return -EFAULT;
		}
		param = memdup_user(p->pointer, p->length);
		if (IS_ERR(param))
		return PTR_ERR(param);

		switch (param->cmd) {
		case PRISM2_SET_ENCRYPTION:

Admin message