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

Commit 8c11e4ab authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix paged RX crypto 



WEP crypto was broken, but upon finding the problem
it is evident that other things were broken by the
paged RX patch as well.

To fix it, for now move the linearising in front.
This means that we linearise all frames, which is
not at all what we want, but at least it fixes the
problem for now.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 54297e4d

net/mac80211/rx.c

+6 −4
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) 
{

	struct sk_buff *skb = rx->skb;

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

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

	struct ieee80211_hdr *hdr;

	int keyidx;

	int hdrlen;

	ieee80211_rx_result result = RX_DROP_UNUSABLE;
@@ -861,6 +861,11 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) 
	if (!(rx->flags & IEEE80211_RX_RA_MATCH))

		return RX_CONTINUE;



	if (skb_linearize(rx->skb))

		return RX_DROP_UNUSABLE;



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



	/* start without a key */

	rx->key = NULL;
@@ -944,9 +949,6 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) 
		return RX_DROP_MONITOR;

	}



	if (skb_linearize(rx->skb))

		return RX_DROP_UNUSABLE;



	/* Check for weak IVs if possible */

	if (rx->sta && rx->key->conf.alg == ALG_WEP &&

	    ieee80211_is_data(hdr->frame_control) &&