diff --git a/[refs] b/[refs]
index 95849569c800..d5a890f95ee8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0875abf83df7d74bf9858c125e82835bd1ca349c
+refs/heads/master: 9603ff50b5d56e6ee64b10116ff640320732f9c8
diff --git a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
index 88a9cd1958a8..fc96676bb9ce 100644
--- a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
+++ b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
@@ -1564,8 +1564,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;
 		}
 	}