mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

fixes for wpa/wpa2

Browse Source 
SVN-Revision: 7453
This commit is contained in:
Felix Fietkau 2007-06-02 17:04:43 +00:00
parent e4aa279bf8
commit 07796f7873
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/madwifi/patches/121-ibss_hostap.patch
View File

@ -1,6 +1,14 @@
diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
--- madwifi.old/ath/if_ath.c 2007-06-01 12:22:06.641518272 +0200 --- madwifi.old/ath/if_ath.c 2007-06-01 12:22:06.641518272 +0200
+++ madwifi.dev/ath/if_ath.c 2007-06-01 12:22:55.326117088 +0200 +++ madwifi.dev/ath/if_ath.c 2007-06-01 12:22:55.326117088 +0200
@@ -407,7 +407,6 @@
* and use the next two bits as the index of the VAP.
*/
#define ATH_SET_VAP_BSSID_MASK(bssid_mask) ((bssid_mask)[0] &= ~(((ATH_BCBUF-1)<<2)|0x02))
-#define ATH_GET_VAP_ID(bssid) ((bssid)[0] >> 2)
#define ATH_SET_VAP_BSSID(bssid, id) \
do { \
if (id) \
@@ -1048,9 +1048,12 @@ @@ -1048,9 +1048,12 @@
ic_opmode = opmode; ic_opmode = opmode;
break; break;
@ -121,7 +129,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM); HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM);
return rfilt; return rfilt;
@@ -5809,12 +5801,19 @@ @@ -5809,12 +5801,20 @@
type = ieee80211_input(ni, skb, rs->rs_rssi, rs->rs_tstamp); type = ieee80211_input(ni, skb, rs->rs_rssi, rs->rs_tstamp);
ieee80211_unref_node(&ni); ieee80211_unref_node(&ni);
} else { } else {
@ -132,7 +140,8 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
*/ */
- ni = ieee80211_find_rxnode(ic, - ni = ieee80211_find_rxnode(ic,
- (const struct ieee80211_frame_min *) skb->data); - (const struct ieee80211_frame_min *) skb->data);
+ if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PROBE_REQ) + if (((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PROBE_REQ) &&
+ (sc->sc_nibssvaps > 0))
+ /* if this is a probe request, send it to all vaps + /* if this is a probe request, send it to all vaps
+ * when looking up nodes, hostap will be preferred over ibss, + * when looking up nodes, hostap will be preferred over ibss,
+ * because ibss will catch all nodes */ + * because ibss will catch all nodes */

24
package/madwifi/patches/123-ccmp_checks.patch Normal file
View File

@ -0,0 +1,24 @@
Only in madwifi.dev/ath: if_ath.c.orig
diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee80211_crypto_ccmp.c
--- madwifi.old/net80211/ieee80211_crypto_ccmp.c 2007-06-02 04:37:47.425966000 +0200
+++ madwifi.dev/net80211/ieee80211_crypto_ccmp.c 2007-06-02 18:38:27.675882768 +0200
@@ -465,6 +465,9 @@
uint8_t *mic, *pos;
u_int space;
+ if (ctx->cc_tfm == NULL)
+ return 0;
+
ctx->cc_vap->iv_stats.is_crypto_ccmp++;
skb = skb0;
@@ -579,6 +582,9 @@
uint8_t *pos, *mic;
u_int space;
+ if (ctx->cc_tfm == NULL)
+ return 0;
+
ctx->cc_vap->iv_stats.is_crypto_ccmp++;
skb = skb0;

9
package/madwifi/patches/309-micfail_detect.patch
View File

@ -47,12 +47,19 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
dev_kfree_skb(skb); dev_kfree_skb(skb);
skb = NULL; skb = NULL;
goto rx_next; goto rx_next;
@@ -5806,6 +5790,20 @@ @@ -5806,6 +5790,27 @@
sc->sc_hwmap[rs->rs_rate].ieeerate, sc->sc_hwmap[rs->rs_rate].ieeerate,
rs->rs_rssi); rs->rs_rssi);
+ /* MIC failure. Drop the packet in any case */ + /* MIC failure. Drop the packet in any case */
+ if (mic_fail) { + if (mic_fail) {
+ /* Drop control frames which are reported with mic error */
+ if ((((struct ieee80211_frame *)skb->data)->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) {
+ dev_kfree_skb(skb);
+ skb = NULL;
+ mic_fail = 0;
+ goto rx_next;
+ }
+ ni = ieee80211_find_rxnode(ic, + ni = ieee80211_find_rxnode(ic,
+ (const struct ieee80211_frame_min *) skb->data); + (const struct ieee80211_frame_min *) skb->data);
+ if (ni != NULL) { + if (ni != NULL) {