From b048aeef2ad76835166b4df537f32c6b2b2fadad Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Thu, 27 May 2010 11:05:04 -0700
Subject: [PATCH] --- yaml --- r: 199366 b: refs/heads/master c:
 767dcd42e51c69be88f83683eda7883e522618fa h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/infiniband/core/ucm.c | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 9c72810575fe..4aa7758f59b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7145c45a06e9c918ccf2d8b27b01409a98a67be7
+refs/heads/master: 767dcd42e51c69be88f83683eda7883e522618fa
diff --git a/trunk/drivers/infiniband/core/ucm.c b/trunk/drivers/infiniband/core/ucm.c
index 46474842cfe9..08f948df8fa9 100644
--- a/trunk/drivers/infiniband/core/ucm.c
+++ b/trunk/drivers/infiniband/core/ucm.c
@@ -706,14 +706,9 @@ static int ib_ucm_alloc_data(const void **dest, u64 src, u32 len)
 	if (!len)
 		return 0;
 
-	data = kmalloc(len, GFP_KERNEL);
-	if (!data)
-		return -ENOMEM;
-
-	if (copy_from_user(data, (void __user *)(unsigned long)src, len)) {
-		kfree(data);
-		return -EFAULT;
-	}
+	data = memdup_user((void __user *)(unsigned long)src, len);
+	if (IS_ERR(data))
+		return PTR_ERR(data);
 
 	*dest = data;
 	return 0;