From ed221540f612aea98ce471962b23f8415f5de9c7 Mon Sep 17 00:00:00 2001
From: Xiaochen Wang <wangxiaochen0@gmail.com>
Date: Fri, 4 Mar 2011 13:09:00 +0800
Subject: [PATCH] --- yaml --- r: 236301 b: refs/heads/master c:
 0875abf83df7d74bf9858c125e82835bd1ca349c h: refs/heads/master i:   236299:
 7e2554f3ef5644cc3b5463b32854a80114c7ecf7 v: v3

---
 [refs]                                                       | 2 +-
 .../drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3f05a8dc6ad5..95849569c800 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9025c0faeefdbffd0b65e155876824e4e8de1723
+refs/heads/master: 0875abf83df7d74bf9858c125e82835bd1ca349c
diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 652d879509e6..74a3b4c211ad 100644
--- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -1435,8 +1435,9 @@ static inline u16 auth_parse(struct sk_buff *skb, u8** challenge, int *chlen)
 
 		if(*(t++) == MFIE_TYPE_CHALLENGE){
 			*chlen = *(t++);
-			*challenge = kmalloc(*chlen, GFP_ATOMIC);
-			memcpy(*challenge, t, *chlen);
+			*challenge = kmemdup(t, *chlen, GFP_ATOMIC);
+			if (!*challenge)
+				return -ENOMEM;
 		}
 	}