From 7b8592d03da9beb53d71756d9eb687181eefabd1 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Tue, 8 Nov 2011 20:30:20 +0100
Subject: [PATCH] --- yaml --- r: 281055 b: refs/heads/master c:
 23226977e9421434a2e7e384219477199ca5f0ec h: refs/heads/master i:   281053:
 b33ffe5076aff43216245628db4fbf52cda4d81f   281051:
 bdf862483fb496a7a9def582d1ccb7551f8f27b0   281047:
 549ceb489222f8cf3fcf2afd18e16a8dc7b7803b   281039:
 3df6b0fa5dd06b8a3d0f4156dc5a20bdcb58ba57   281023:
 33fb845bd4e77d20329a8384e01b9eca7d95702e v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/rtl8192e/rtllib_wx.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 18abdcf6d4ea..36ab52997d03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9317533c54836887d64bba973ae5c9c341b36a0
+refs/heads/master: 23226977e9421434a2e7e384219477199ca5f0ec
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_wx.c b/trunk/drivers/staging/rtl8192e/rtllib_wx.c
index a8fd2e1f4ada..b4f00e54bd02 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_wx.c
@@ -845,10 +845,9 @@ int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len)
 
 			ieee->wps_ie_len = (len < MAX_WZC_IE_LEN) ? (len) :
 					   (MAX_WZC_IE_LEN);
-			buf = kmalloc(ieee->wps_ie_len, GFP_KERNEL);
+			buf = kmemdup(ie, ieee->wps_ie_len, GFP_KERNEL);
 			if (buf == NULL)
 				return -ENOMEM;
-			memcpy(buf, ie, ieee->wps_ie_len);
 			ieee->wps_ie = buf;
 			return 0;
 		}
@@ -859,10 +858,9 @@ int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len)
 	if (len) {
 		if (len != ie[1]+2)
 			return -EINVAL;
-		buf = kmalloc(len, GFP_KERNEL);
+		buf = kmemdup(ie, len, GFP_KERNEL);
 		if (buf == NULL)
 			return -ENOMEM;
-		memcpy(buf, ie, len);
 		kfree(ieee->wpa_ie);
 		ieee->wpa_ie = buf;
 		ieee->wpa_ie_len = len;