Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 617bbde8 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: move RX WEP weak IV counting 



This is better done inside the WEP decrypt
function where it doesn't have to check all
the conditions any more since they've been
tested already.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6b6fa586

net/mac80211/rx.c

+0 −7
Original line number Diff line number Diff line
@@ -1070,13 +1070,6 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) 
	switch (rx->key->conf.cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

	case WLAN_CIPHER_SUITE_WEP104:

		/* Check for weak IVs if possible */

		if (rx->sta && ieee80211_is_data(fc) &&

		    (!(status->flag & RX_FLAG_IV_STRIPPED) ||

		     !(status->flag & RX_FLAG_DECRYPTED)) &&

		    ieee80211_wep_is_weak_iv(rx->skb, rx->key))

			rx->sta->wep_weak_iv_count++;



		result = ieee80211_crypto_wep_decrypt(rx);

		break;

	case WLAN_CIPHER_SUITE_TKIP:

net/mac80211/wep.c

+6 −4
Original line number Diff line number Diff line
@@ -263,16 +263,14 @@ static int ieee80211_wep_decrypt(struct ieee80211_local *local, 
}





bool ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key)

static bool ieee80211_wep_is_weak_iv(struct sk_buff *skb,

				     struct ieee80211_key *key)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	unsigned int hdrlen;

	u8 *ivpos;

	u32 iv;



	if (!ieee80211_has_protected(hdr->frame_control))

		return false;



	hdrlen = ieee80211_hdrlen(hdr->frame_control);

	ivpos = skb->data + hdrlen;

	iv = (ivpos[0] << 16) | (ivpos[1] << 8) | ivpos[2];
@@ -292,9 +290,13 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx) 
		return RX_CONTINUE;



	if (!(status->flag & RX_FLAG_DECRYPTED)) {

		if (rx->sta && ieee80211_wep_is_weak_iv(rx->skb, rx->key))

			rx->sta->wep_weak_iv_count++;

		if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key))

			return RX_DROP_UNUSABLE;

	} else if (!(status->flag & RX_FLAG_IV_STRIPPED)) {

		if (rx->sta && ieee80211_wep_is_weak_iv(rx->skb, rx->key))

			rx->sta->wep_weak_iv_count++;

		ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key);

		/* remove ICV */

		skb_trim(rx->skb, rx->skb->len - WEP_ICV_LEN);

net/mac80211/wep.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ int ieee80211_wep_encrypt(struct ieee80211_local *local, 
			  const u8 *key, int keylen, int keyidx);

int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,

			       size_t klen, u8 *data, size_t data_len);

bool ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key);



ieee80211_rx_result

ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx);