RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath9k: add some extra checks to the mic failure fix 

SVN-Revision: 22825
This commit is contained in:
Felix Fietkau 2010-08-28 16:23:45 +00:00
parent e874503f3f
commit c3bcd846e9
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/mac80211/patches/570-ath9k_mic_failure_fix.patch
View File

@ -44,7 +44,7 @@
EXPORT_SYMBOL(ath9k_cmn_key_delete); EXPORT_SYMBOL(ath9k_cmn_key_delete);
--- a/drivers/net/wireless/ath/ath9k/recv.c --- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -870,15 +870,19 @@ static bool ath9k_rx_accept(struct ath_c @@ -870,15 +870,18 @@ static bool ath9k_rx_accept(struct ath_c
if (rx_stats->rs_status & ATH9K_RXERR_DECRYPT) { if (rx_stats->rs_status & ATH9K_RXERR_DECRYPT) {
*decrypt_error = true; *decrypt_error = true;
} else if (rx_stats->rs_status & ATH9K_RXERR_MIC) { } else if (rx_stats->rs_status & ATH9K_RXERR_MIC) {
@ -58,17 +58,28 @@
- else - else
+ /* + /*
+ * The MIC error bit is only valid if the frame + * The MIC error bit is only valid if the frame
+ * is not a control frame, and it was decrypted using + * is not a control frame or fragment, and it was
+ * a TKIP key. + * decrypted using a valid TKIP key.
+ */ + */
+ if (!ieee80211_is_ctl(fc) && + if (!ieee80211_is_ctl(fc) &&
+ rx_stats->rs_keyix != ATH9K_RXKEYIX_INVALID && + !ieee80211_has_morefrags(fc) &&
+ test_bit(rx_stats->rs_keyix, common->tkip_keymap)) { + !(le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG) &&
+ test_bit(rx_stats->rs_keyix, common->tkip_keymap))
rxs->flag |= RX_FLAG_MMIC_ERROR; rxs->flag |= RX_FLAG_MMIC_ERROR;
+ } else { + else
+ rx_stats->rs_status &= ~ATH9K_RXERR_MIC; + rx_stats->rs_status &= ~ATH9K_RXERR_MIC;
+ *decrypt_error = true;
+ }
} }
/* /*
* Reject error frames with the exception of * Reject error frames with the exception of
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -711,7 +711,8 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
rs->rs_phyerr = phyerr;
} else if (ads.ds_rxstatus8 & AR_DecryptCRCErr)
rs->rs_status |= ATH9K_RXERR_DECRYPT;
- else if (ads.ds_rxstatus8 & AR_MichaelErr)
+ else if ((ads.ds_rxstatus8 & AR_MichaelErr) &&
+ rs->rs_keyix != ATH9K_RXKEYIX_INVALID)
rs->rs_status |= ATH9K_RXERR_MIC;
else if (ads.ds_rxstatus8 & AR_KeyMiss)
rs->rs_status |= ATH9K_RXERR_DECRYPT;