Commit a51faabc authored May 26, 2010 by Julia Lawall Committed by Linus Torvalds May 27, 2010

drivers/video/via: 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>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 9966c4fe

drivers/video/via/viafbdev.c

+3 −8

Original line number	Original line	Diff line number	Diff line
	@@ -578,14 +578,9 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
	break;		break;

	case VIAFB_SET_GAMMA_LUT:		case VIAFB_SET_GAMMA_LUT:
	viafb_gamma_table = kmalloc(256 * sizeof(u32), GFP_KERNEL);		viafb_gamma_table = memdup_user(argp, 256 * sizeof(u32));
	if (!viafb_gamma_table)		if (IS_ERR(viafb_gamma_table))
	return -ENOMEM;		return PTR_ERR(viafb_gamma_table);
	if (copy_from_user(viafb_gamma_table, argp,
	256 * sizeof(u32))) {
	kfree(viafb_gamma_table);
	return -EFAULT;
	}
	viafb_set_gamma_table(viafb_bpp, viafb_gamma_table);		viafb_set_gamma_table(viafb_bpp, viafb_gamma_table);
	kfree(viafb_gamma_table);		kfree(viafb_gamma_table);
	break;		break;