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

Commit 3094141c authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds
Browse files

drivers/scsi: 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>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Boaz Harrosh <bharrosh@panasas.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a737b88d

drivers/scsi/sg.c

+3 −8
Original line number Diff line number Diff line
@@ -1686,14 +1686,9 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd) 
		int len, size = sizeof(struct sg_iovec) * iov_count;

		struct iovec *iov;



		iov = kmalloc(size, GFP_ATOMIC);

		if (!iov)

			return -ENOMEM;



		if (copy_from_user(iov, hp->dxferp, size)) {

			kfree(iov);

			return -EFAULT;

		}

		iov = memdup_user(hp->dxferp, size);

		if (IS_ERR(iov))

			return PTR_ERR(iov);



		len = iov_length(iov, iov_count);

		if (hp->dxfer_len < len) {