|
@@ -98,8 +98,7 @@ static u8 *ieee80211_wep_add_iv(struct ieee80211_local *local,
|
|
|
|
|
|
hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
|
|
hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
|
|
|
|
|
|
- if (WARN_ON(skb_tailroom(skb) < IEEE80211_WEP_ICV_LEN ||
|
|
|
|
- skb_headroom(skb) < IEEE80211_WEP_IV_LEN))
|
|
|
|
|
|
+ if (WARN_ON(skb_headroom(skb) < IEEE80211_WEP_IV_LEN))
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|
|
hdrlen = ieee80211_hdrlen(hdr->frame_control);
|
|
hdrlen = ieee80211_hdrlen(hdr->frame_control);
|
|
@@ -167,6 +166,9 @@ int ieee80211_wep_encrypt(struct ieee80211_local *local,
|
|
size_t len;
|
|
size_t len;
|
|
u8 rc4key[3 + WLAN_KEY_LEN_WEP104];
|
|
u8 rc4key[3 + WLAN_KEY_LEN_WEP104];
|
|
|
|
|
|
|
|
+ if (WARN_ON(skb_tailroom(skb) < IEEE80211_WEP_ICV_LEN))
|
|
|
|
+ return -1;
|
|
|
|
+
|
|
iv = ieee80211_wep_add_iv(local, skb, keylen, keyidx);
|
|
iv = ieee80211_wep_add_iv(local, skb, keylen, keyidx);
|
|
if (!iv)
|
|
if (!iv)
|
|
return -1;
|
|
return -1;
|