Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drivers/telephony/ixj.c: use memdup_user

Browse source 
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>
This commit is contained in:
Julia Lawall 2010-05-26 14:42:32 -07:00 committed by Linus Torvalds
parent 8fc809d179
commit b8d6b0d6b6
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/telephony/ixj.c
View file

@ -5879,19 +5879,12 @@ static int ixj_build_cadence(IXJ *j, IXJ_CADENCE __user * cp)
static int ixj_build_filter_cadence(IXJ *j, IXJ_FILTER_CADENCE __user * cp) static int ixj_build_filter_cadence(IXJ *j, IXJ_FILTER_CADENCE __user * cp)
{ {
IXJ_FILTER_CADENCE *lcp; IXJ_FILTER_CADENCE *lcp;
lcp = kmalloc(sizeof(IXJ_FILTER_CADENCE), GFP_KERNEL); lcp = memdup_user(cp, sizeof(IXJ_FILTER_CADENCE));
if (lcp == NULL) { if (IS_ERR(lcp)) {
if(ixjdebug & 0x0001) { 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; return PTR_ERR(lcp);
}
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;
} }
if (lcp->filter > 5) { if (lcp->filter > 5) {
if(ixjdebug & 0x0001) { if(ixjdebug & 0x0001) {