aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-22 04:26:22 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 17:35:34 -0400
commitbe8a058b50a90282d32aa638720195e1c327c569 (patch)
tree7424cb27031e7fd295810d856b1f265a91beb438 /drivers
parent37cd681c022a0a46ebcff025897a57457d3ca8cd (diff)
USB: gadget: 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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/inode.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index de8a83803505..63fc171c0ed9 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1867,13 +1867,9 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
1867 buf += 4; 1867 buf += 4;
1868 length -= 4; 1868 length -= 4;
1869 1869
1870 kbuf = kmalloc (length, GFP_KERNEL); 1870 kbuf = memdup_user(buf, length);
1871 if (!kbuf) 1871 if (IS_ERR(kbuf))
1872 return -ENOMEM; 1872 return PTR_ERR(kbuf);
1873 if (copy_from_user (kbuf, buf, length)) {
1874 kfree (kbuf);
1875 return -EFAULT;
1876 }
1877 1873
1878 spin_lock_irq (&dev->lock); 1874 spin_lock_irq (&dev->lock);
1879 value = -EINVAL; 1875 value = -EINVAL;