drivers/ide: Use memdup_user
authorJulia Lawall <julia@diku.dk>
Fri, 4 Jun 2010 23:11:17 +0000 (16:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Aug 2010 10:17:53 +0000 (03:17 -0700)
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>
drivers/ide/ide-taskfile.c

index 67fb73559fd582e0bbd477500636c315834b7764..34b9872f35d1238b623ce00373e2f040dd5bd248 100644 (file)
@@ -480,13 +480,9 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
        u16 nsect               = 0;
        char __user *buf = (char __user *)arg;
 
-       req_task = kzalloc(tasksize, GFP_KERNEL);
-       if (req_task == NULL)
-               return -ENOMEM;
-       if (copy_from_user(req_task, buf, tasksize)) {
-               kfree(req_task);
-               return -EFAULT;
-       }
+       req_task = memdup_user(buf, tasksize);
+       if (IS_ERR(req_task))
+               return PTR_ERR(req_task);
 
        taskout = req_task->out_size;
        taskin  = req_task->in_size;