From 1327613890808e6e6caa146421dd9ecc694e720f Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 21 May 2010 22:20:26 +0000
Subject: [PATCH] --- yaml --- r: 202581 b: refs/heads/master c:
 c146fc9fc9bc1dc0f629fe83d49f32ab0f11bfdc h: refs/heads/master i:   202579:
 14d00a0e16336127c55fd9938735093e06302fa8 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/net/wan/sdla.c | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index c19d253ab469..0587999dcfc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5dc9a3581f486a738f82a5317229d494d0f475f
+refs/heads/master: c146fc9fc9bc1dc0f629fe83d49f32ab0f11bfdc
diff --git a/trunk/drivers/net/wan/sdla.c b/trunk/drivers/net/wan/sdla.c
index 43ae6f440bfb..e155938c4f82 100644
--- a/trunk/drivers/net/wan/sdla.c
+++ b/trunk/drivers/net/wan/sdla.c
@@ -1211,14 +1211,9 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
 	}
 	else
 	{
-		temp = kmalloc(mem.len, GFP_KERNEL);
-		if (!temp)
-			return(-ENOMEM);
-		if(copy_from_user(temp, mem.data, mem.len))
-		{
-			kfree(temp);
-			return -EFAULT;
-		}
+		temp = memdup_user(mem.data, mem.len);
+		if (IS_ERR(temp))
+			return PTR_ERR(temp);
 		sdla_write(dev, mem.addr, temp, mem.len);
 		kfree(temp);
 	}