X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a97e529e3fb77b1200ef53d30b3e4af696588171..57660adae3b1b69482898ab20abf4f96a1541b9a:/package/madwifi/patches/309-micfail_detect.patch diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch index 2fa74cc02..19bea79be 100644 --- a/package/madwifi/patches/309-micfail_detect.patch +++ b/package/madwifi/patches/309-micfail_detect.patch @@ -1,16 +1,14 @@ -Index: madwifi-ng-r2568-20070710/ath/if_ath.c -=================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:21.021494493 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:21.297510222 +0200 -@@ -5630,6 +5630,7 @@ - u_int64_t rs_tsf; +--- a/ath/if_ath.c ++++ b/ath/if_ath.c +@@ -6457,6 +6457,7 @@ ath_rx_poll(struct net_device *dev, int + int type; + u_int phyerr; u_int processed = 0, early_stop = 0; - u_int rx_limit = dev->quota; + u_int mic_fail = 0; - /* Let the 802.11 layer know about the new noise floor */ - sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan)); -@@ -5724,25 +5725,7 @@ + DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n"); + process_rx_again: +@@ -6558,24 +6559,8 @@ process_rx_again: } if (rs->rs_status & HAL_RXERR_MIC) { sc->sc_stats.ast_rx_badmic++; @@ -19,7 +17,6 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c - * the 802.11 header for notification. - */ - /* XXX frag's and QoS frames */ -- len = rs->rs_datalen; - if (len >= sizeof (struct ieee80211_frame)) { - bus_dma_sync_single(sc->sc_bdev, - bf->bf_skbaddr, len, @@ -27,17 +24,18 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c -#if 0 -/* XXX revalidate MIC, lookup ni to find VAP */ - ieee80211_notify_michael_failure(ic, -- (struct ieee80211_frame *) skb->data, +- (struct ieee80211_frame *)skb->data, - sc->sc_splitmic ? - rs->rs_keyix - 32 : rs->rs_keyix - ); -#endif - } + mic_fail = 1; ++ goto rx_accept; } /* - * Reject error frames if we have no vaps that -@@ -5807,8 +5790,9 @@ + * Reject error frames if we have no vaps that +@@ -6614,8 +6599,9 @@ rx_accept: /* * Finished monitor mode handling, now reject * error frames before passing to other vaps @@ -45,14 +43,13 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c */ - if (rs->rs_status != 0) { + if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) { - dev_kfree_skb(skb); - skb = NULL; + ieee80211_dev_kfree_skb(&skb); goto rx_next; -@@ -5839,6 +5823,27 @@ - sc->sc_hwmap[rs->rs_rate].ieeerate, - rs->rs_rssi); + } +@@ -6623,6 +6609,26 @@ rx_accept: + /* remove the CRC */ + skb_trim(skb, skb->len - IEEE80211_CRC_LEN); -+ /* MIC failure. Drop the packet in any case */ + if (mic_fail) { + /* Ignore control frames which are reported with mic error */ + if ((((struct ieee80211_frame *)skb->data)->i_fc[0] & @@ -71,16 +68,22 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c + skb = NULL; + mic_fail = 0; + goto rx_next; -+ } ++ } + /* - * Locate the node for sender, track state, and then - * pass the (referenced) node up to the 802.11 layer -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-13 11:18:18.465348826 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-13 11:18:21.297510222 +0200 -@@ -73,7 +73,7 @@ + * From this point on we assume the frame is at least + * as large as ieee80211_frame_min; verify that. +@@ -6635,6 +6641,7 @@ rx_accept: + goto rx_next; + } + ++ /* MIC failure. Drop the packet in any case */ + /* + * Normal receive. + */ +--- a/net80211/ieee80211_crypto_ccmp.c ++++ b/net80211/ieee80211_crypto_ccmp.c +@@ -73,7 +73,7 @@ static int ccmp_setkey(struct ieee80211_ static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int); static int ccmp_enmic(struct ieee80211_key *, struct sk_buff *, int); @@ -89,7 +92,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c static const struct ieee80211_cipher ccmp = { .ic_name = "AES-CCM", -@@ -308,7 +308,7 @@ +@@ -308,7 +308,7 @@ ccmp_decap(struct ieee80211_key *k, stru * Verify and strip MIC from the frame. */ static int @@ -98,11 +101,9 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c { return 1; } -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto.h 2007-07-13 11:18:12.749023072 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h 2007-07-13 11:18:21.317511359 +0200 -@@ -145,7 +145,7 @@ +--- a/net80211/ieee80211_crypto.h ++++ b/net80211/ieee80211_crypto.h +@@ -145,7 +145,7 @@ struct ieee80211_cipher { int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t); int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int); int (*ic_enmic)(struct ieee80211_key *, struct sk_buff *, int); @@ -111,7 +112,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h }; extern const struct ieee80211_cipher ieee80211_cipher_none; -@@ -163,10 +163,10 @@ +@@ -163,10 +163,10 @@ struct ieee80211_key *ieee80211_crypto_d */ static __inline int ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k, @@ -124,11 +125,9 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h } /* -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_none.c 2007-07-13 11:18:12.757023527 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c 2007-07-13 11:18:21.333512274 +0200 -@@ -52,7 +52,7 @@ +--- a/net80211/ieee80211_crypto_none.c ++++ b/net80211/ieee80211_crypto_none.c +@@ -52,7 +52,7 @@ static int none_setkey(struct ieee80211_ static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int none_decap(struct ieee80211_key *, struct sk_buff *, int); static int none_enmic(struct ieee80211_key *, struct sk_buff *, int); @@ -137,7 +136,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c const struct ieee80211_cipher ieee80211_cipher_none = { .ic_name = "NONE", -@@ -137,7 +137,7 @@ +@@ -137,7 +137,7 @@ none_enmic(struct ieee80211_key *k, stru } static int @@ -146,11 +145,9 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c { struct ieee80211vap *vap = k->wk_private; -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_tkip.c 2007-07-13 11:18:12.765023983 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c 2007-07-13 11:18:21.373514552 +0200 -@@ -57,7 +57,7 @@ +--- a/net80211/ieee80211_crypto_tkip.c ++++ b/net80211/ieee80211_crypto_tkip.c +@@ -57,7 +57,7 @@ static int tkip_setkey(struct ieee80211_ static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int); static int tkip_decap(struct ieee80211_key *, struct sk_buff *, int); @@ -159,7 +156,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c static const struct ieee80211_cipher tkip = { .ic_name = "TKIP", -@@ -339,7 +339,7 @@ +@@ -339,7 +339,7 @@ tkip_decap(struct ieee80211_key *k, stru * Verify and strip MIC from the frame. */ static int @@ -168,7 +165,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c { struct tkip_ctx *ctx = k->wk_private; struct sk_buff *skb; -@@ -355,7 +355,7 @@ +@@ -355,7 +355,7 @@ tkip_demic(struct ieee80211_key *k, stru } wh = (struct ieee80211_frame *) skb0->data; /* NB: skb left pointing at last in chain */ @@ -177,11 +174,9 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c struct ieee80211vap *vap = ctx->tc_vap; u8 mic[IEEE80211_WEP_MICLEN]; u8 mic0[IEEE80211_WEP_MICLEN]; -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_wep.c 2007-07-13 11:18:12.769024209 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c 2007-07-13 11:18:21.393515692 +0200 -@@ -54,7 +54,7 @@ +--- a/net80211/ieee80211_crypto_wep.c ++++ b/net80211/ieee80211_crypto_wep.c +@@ -54,7 +54,7 @@ static int wep_setkey(struct ieee80211_k static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int wep_decap(struct ieee80211_key *, struct sk_buff *, int); static int wep_enmic(struct ieee80211_key *, struct sk_buff *, int); @@ -190,7 +185,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c static const struct ieee80211_cipher wep = { .ic_name = "WEP", -@@ -244,7 +244,7 @@ +@@ -244,7 +244,7 @@ wep_decap(struct ieee80211_key *k, struc * Verify and strip MIC from the frame. */ static int @@ -199,11 +194,9 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c { return 1; } -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-13 11:18:20.621471697 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-13 11:18:21.417517061 +0200 -@@ -632,7 +632,7 @@ +--- a/net80211/ieee80211_input.c ++++ b/net80211/ieee80211_input.c +@@ -669,7 +669,7 @@ ieee80211_input(struct ieee80211vap * va * Next strip any MSDU crypto bits. */ if (key != NULL && @@ -212,7 +205,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ni->ni_macaddr, "data", "%s", "demic error"); IEEE80211_NODE_STAT(ni, rx_demicfail); -@@ -3772,6 +3772,47 @@ +@@ -4293,6 +4293,47 @@ ath_eth_type_trans(struct sk_buff *skb, } #endif @@ -260,11 +253,9 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c #ifdef IEEE80211_DEBUG /* * Debugging support. -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.h 2007-07-13 11:18:12.785025121 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h 2007-07-13 11:18:21.441518427 +0200 -@@ -91,6 +91,7 @@ +--- a/net80211/ieee80211_proto.h ++++ b/net80211/ieee80211_proto.h +@@ -90,6 +90,7 @@ int ieee80211_iserp_rateset(struct ieee8 void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *); void ieee80211_send_pspoll(struct ieee80211_node *); @@ -272,26 +263,22 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h /* * Return the size of the 802.11 header for a management or data frame. -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_linux.c 2007-07-13 11:18:18.229335376 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c 2007-07-13 11:18:21.485520935 +0200 -@@ -291,8 +291,8 @@ +--- a/net80211/ieee80211_linux.c ++++ b/net80211/ieee80211_linux.c +@@ -337,8 +337,8 @@ ieee80211_notify_replay_failure(struct i /* TODO: needed parameters: count, keyid, key type, src address, TSC */ - snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag, + snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=" MAC_FMT ")", tag, k->wk_keyix, - IEEE80211_IS_MULTICAST(wh->i_addr1) ? "broad" : "uni", -- ether_sprintf(wh->i_addr1)); +- MAC_ADDR(wh->i_addr1)); + IEEE80211_IS_MULTICAST(wh->i_addr2) ? "broad" : "uni", -+ ether_sprintf(wh->i_addr2)); ++ MAC_ADDR(wh->i_addr2)); memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.length = strlen(buf); wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_output.c 2007-07-13 11:18:12.797025805 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_output.c 2007-07-13 11:18:21.509522302 +0200 -@@ -1079,13 +1079,16 @@ +--- a/net80211/ieee80211_output.c ++++ b/net80211/ieee80211_output.c +@@ -1074,13 +1074,16 @@ ieee80211_encap(struct ieee80211_node *n cip = (struct ieee80211_cipher *) key->wk_cipher; ciphdrsize = cip->ic_header; tailsize += (cip->ic_trailer + cip->ic_miclen); @@ -311,24 +298,22 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c /* * Allocate sk_buff for each subsequent fragment; First fragment -Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c -=================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-13 11:18:20.637472608 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-13 11:18:21.533523672 +0200 -@@ -1891,11 +1891,13 @@ +--- a/net80211/ieee80211_node.c ++++ b/net80211/ieee80211_node.c +@@ -2264,11 +2264,13 @@ ieee80211_node_leave(struct ieee80211_no /* From this point onwards we can no longer find the node, * so no more references are generated */ - ieee80211_remove_wds_addr(nt, ni->ni_macaddr); - ieee80211_del_wds_node(nt, ni); - IEEE80211_NODE_TABLE_LOCK_IRQ(nt); -- _node_table_leave(nt, ni); +- node_table_leave_locked(nt, ni); - IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt); + if (nt) { + ieee80211_remove_wds_addr(nt, ni->ni_macaddr); + ieee80211_del_wds_node(nt, ni); + IEEE80211_NODE_TABLE_LOCK_IRQ(nt); -+ _node_table_leave(nt, ni); ++ node_table_leave_locked(nt, ni); + IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt); + }