Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[karo-tx-linux.git] / drivers / staging / rtl8192e / rtllib_softmac.c

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 4feecec8609c696e29e745a0b2b7833def2f917b..aefffac556a66c7c273b3cc32fc8b2d33a4a0a7e 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1801,8 +1801,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);  /*TODO - check here*/
+                       *challenge = kmemdup(t, *chlen, GFP_ATOMIC);
+                       if (!*challenge)
+                               return -ENOMEM;
                }
        }
        return cpu_to_le16(a->status);