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

Commit ad96a7a7 authored by Julia Lawall's avatar Julia Lawall Committed by Jens Axboe
Browse files

drivers/block: use memdup_user 

Use memdup_user when user data is immediately copied into the
allocated region.  Some checkpatch cleanups in nearby code.

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: Chirag Kantharia <chirag.kantharia@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 6a32a8ae

drivers/block/cpqarray.c

+10 −22
Original line number Diff line number Diff line
@@ -1255,17 +1255,11 @@ static int ida_ctlr_ioctl(ctlr_info_t *h, int dsk, ida_ioctl_t *io) 
	/* Pre submit processing */

	switch(io->cmd) {

	case PASSTHRU_A:

		p = kmalloc(io->sg[0].size, GFP_KERNEL);

		if (!p) 

		{ 

			error = -ENOMEM; 

			cmd_free(h, c, 0); 

			return(error);

		}

		if (copy_from_user(p, io->sg[0].addr, io->sg[0].size)) {

			kfree(p);

		p = memdup_user(io->sg[0].addr, io->sg[0].size);

		if (IS_ERR(p)) {

			error = PTR_ERR(p);

			cmd_free(h, c, 0);

			return -EFAULT;

			return error;

		}

		c->req.hdr.blk = pci_map_single(h->pci_dev, &(io->c), 

				sizeof(ida_ioctl_t),
@@ -1296,17 +1290,11 @@ static int ida_ctlr_ioctl(ctlr_info_t *h, int dsk, ida_ioctl_t *io) 
	case DIAG_PASS_THRU:

	case COLLECT_BUFFER:

	case WRITE_FLASH_ROM:

		p = kmalloc(io->sg[0].size, GFP_KERNEL);

		if (!p) 

 		{ 

                        error = -ENOMEM; 

                        cmd_free(h, c, 0);

                        return(error);

                }

		if (copy_from_user(p, io->sg[0].addr, io->sg[0].size)) {

			kfree(p);

		p = memdup_user(io->sg[0].addr, io->sg[0].size);

		if (IS_ERR(p)) {

			error = PTR_ERR(p);

			cmd_free(h, c, 0);

			return -EFAULT;

			return error;

                }

		c->req.sg[0].size = io->sg[0].size;

		c->req.sg[0].addr = pci_map_single(h->pci_dev, p,