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

drivers/telephony/ixj.c: 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8fc809d1

drivers/telephony/ixj.c

+4 −11

Original line number	Diff line number	Diff line
		@@ -5879,19 +5879,12 @@ out:
		static int ixj_build_filter_cadence(IXJ j, IXJ_FILTER_CADENCE __user cp)
		{
		IXJ_FILTER_CADENCE *lcp;
		lcp = kmalloc(sizeof(IXJ_FILTER_CADENCE), GFP_KERNEL);
		if (lcp == NULL) {
		lcp = memdup_user(cp, sizeof(IXJ_FILTER_CADENCE));
		if (IS_ERR(lcp)) {
		if(ixjdebug & 0x0001) {
		printk(KERN_INFO "Could not allocate memory for cadence\n");
		printk(KERN_INFO "Could not allocate memory for cadence or could not copy cadence to kernel\n");
		}
		return -ENOMEM;
		}
		if (copy_from_user(lcp, cp, sizeof(IXJ_FILTER_CADENCE))) {
		if(ixjdebug & 0x0001) {
		printk(KERN_INFO "Could not copy cadence to kernel\n");
		}
		kfree(lcp);
		return -EFAULT;
		return PTR_ERR(lcp);
		}
		if (lcp->filter > 5) {
		if(ixjdebug & 0x0001) {