aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c')
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index e099a5fa049..b7426fea549 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -1435,7 +1435,7 @@ static inline u16 auth_parse(struct sk_buff *skb, u8** challenge, int *chlen)
1435 1435
1436 if(*(t++) == MFIE_TYPE_CHALLENGE){ 1436 if(*(t++) == MFIE_TYPE_CHALLENGE){
1437 *chlen = *(t++); 1437 *chlen = *(t++);
1438 *challenge = (u8*)kmalloc(*chlen, GFP_ATOMIC); 1438 *challenge = kmalloc(*chlen, GFP_ATOMIC);
1439 memcpy(*challenge, t, *chlen); 1439 memcpy(*challenge, t, *chlen);
1440 } 1440 }
1441 } 1441 }
@@ -2861,8 +2861,7 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
2861 2861
2862 ieee80211_crypt_delayed_deinit(ieee, crypt); 2862 ieee80211_crypt_delayed_deinit(ieee, crypt);
2863 2863
2864 new_crypt = (struct ieee80211_crypt_data *) 2864 new_crypt = kmalloc(sizeof(*new_crypt), GFP_KERNEL);
2865 kmalloc(sizeof(*new_crypt), GFP_KERNEL);
2866 if (new_crypt == NULL) { 2865 if (new_crypt == NULL) {
2867 ret = -ENOMEM; 2866 ret = -ENOMEM;
2868 goto done; 2867 goto done;
@@ -2953,7 +2952,7 @@ int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_poin
2953 goto out; 2952 goto out;
2954 } 2953 }
2955 2954
2956 param = (struct ieee_param *)kmalloc(p->length, GFP_KERNEL); 2955 param = kmalloc(p->length, GFP_KERNEL);
2957 if (param == NULL){ 2956 if (param == NULL){
2958 ret = -ENOMEM; 2957 ret = -ENOMEM;
2959 goto out; 2958 goto out;