From 578e8986e27cd821658caea14e115b119dfd07a7 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 22 May 2010 10:26:22 +0200
Subject: [PATCH] --- yaml --- r: 207951 b: refs/heads/master c:
 be8a058b50a90282d32aa638720195e1c327c569 h: refs/heads/master i:   207949:
 72623a8b0b042fc4a784c8598cbc86c4d45c44f5   207947:
 fd28b667473cae713e032a4f53cd2830402fdd8d   207943:
 77be83891e24d6ccee01c9170da355b184f5a67b   207935:
 1dfc50f0b540ca5884e86c2ada2a4093c1960472 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/usb/gadget/inode.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f81193b0973a..a483c288a3b2 100644
--- 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
index de8a83803505..63fc171c0ed9 100644
--- 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;