---

yaml --- r: 207951 b: refs/heads/master c: be8a058 h: refs/heads/master i: 207949: 72623a8 207947: fd28b66 207943: 77be838 207935: 1dfc50f v: v3
git-mirror · Aug 10, 2010 · 578e898 · 578e898
1 parent 6b74465
commit 578e898
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37cd681c022a0a46ebcff025897a57457d3ca8cd
+refs/heads/master: be8a058b50a90282d32aa638720195e1c327c569
diff --git a/trunk/drivers/usb/gadget/inode.c b/trunk/drivers/usb/gadget/inode.c
@@ -1867,13 +1867,9 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
 	buf += 4;
 	length -= 4;
 
-	kbuf = kmalloc (length, GFP_KERNEL);
-	if (!kbuf)
-		return -ENOMEM;
-	if (copy_from_user (kbuf, buf, length)) {
-		kfree (kbuf);
-		return -EFAULT;
-	}
+	kbuf = memdup_user(buf, length);
+	if (IS_ERR(kbuf))
+		return PTR_ERR(kbuf);
 
 	spin_lock_irq (&dev->lock);
 	value = -EINVAL;