X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b5cb1795de1f0959de1e228bd2e784d1cea921a7..4a3137abd7b3cb269885ab694a0b11a4e84bb98d:/package/madwifi/patches/309-micfail_detect.patch?ds=sidebyside

diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch
index 4ff11aba5..e184a4e9f 100644
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,16 +1,14 @@
-Index: madwifi-ng-r2420-20070602/ath/if_ath.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/ath/if_ath.c	2007-06-04 13:21:58.895023264 +0200
-+++ madwifi-ng-r2420-20070602/ath/if_ath.c	2007-06-04 13:21:59.133986936 +0200
-@@ -5602,6 +5602,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -6459,6 +6459,7 @@
+ 	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));
-@@ -5696,25 +5697,7 @@
+ 	DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n");
+ process_rx_again:
+@@ -6560,24 +6561,8 @@
  			}
  			if (rs->rs_status & HAL_RXERR_MIC) {
  				sc->sc_stats.ast_rx_badmic++;
@@ -19,7 +17,6 @@ Index: madwifi-ng-r2420-20070602/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-r2420-20070602/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 
-@@ -5772,8 +5755,9 @@
+ 			 * Reject error frames if we have no vaps that
+@@ -6616,8 +6601,9 @@
  		/*
  		 * Finished monitor mode handling, now reject
  		 * error frames before passing to other vaps
@@ -45,42 +43,47 @@ Index: madwifi-ng-r2420-20070602/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;
-@@ -5804,6 +5788,27 @@
- 				   sc->sc_hwmap[rs->rs_rate].ieeerate,
- 				   rs->rs_rssi);
+ 		}
+@@ -6625,6 +6611,26 @@
+ 		/* remove the CRC */
+ 		skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
  
-+		/* MIC failure. Drop the packet in any case */
 +		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, 
-+				(const struct ieee80211_frame_min *) skb->data);
-+			if (ni != NULL) {
++			/* Ignore 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)
++				goto drop_micfail;
++
++			ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) skb->data);
++
++			if (ni && ni->ni_table) {
 +				ieee80211_check_mic(ni, skb);
 +				ieee80211_unref_node(&ni);
 +			}
++
++drop_micfail:
 +			dev_kfree_skb_any(skb);
 +			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-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_ccmp.c	2007-06-04 13:21:57.936169032 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c	2007-06-04 13:21:59.134986784 +0200
-@@ -78,7 +78,7 @@
+ 		 * From this point on we assume the frame is at least
+ 		 * as large as ieee80211_frame_min; verify that.
+@@ -6637,6 +6643,7 @@
+ 			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_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-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
  
  static const struct ieee80211_cipher ccmp = {
  	.ic_name	= "AES-CCM",
-@@ -304,7 +304,7 @@
+@@ -308,7 +308,7 @@
   * Verify and strip MIC from the frame.
   */
  static int
@@ -98,10 +101,8 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
  {
  	return 1;
  }
-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto.h
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto.h	2007-06-04 13:21:53.000919304 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto.h	2007-06-04 13:21:59.134986784 +0200
+--- a/net80211/ieee80211_crypto.h
++++ b/net80211/ieee80211_crypto.h
 @@ -145,7 +145,7 @@
  	int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  	int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
@@ -124,10 +125,8 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto.h
  }
  
  /*
-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_none.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_none.c	2007-06-04 13:21:53.005918544 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_none.c	2007-06-04 13:21:59.134986784 +0200
+--- a/net80211/ieee80211_crypto_none.c
++++ b/net80211/ieee80211_crypto_none.c
 @@ -52,7 +52,7 @@
  static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int none_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -146,10 +145,8 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_none.c
  {
  	struct ieee80211vap *vap = k->wk_private;
  
-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_tkip.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_tkip.c	2007-06-04 13:21:53.011917632 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_tkip.c	2007-06-04 13:21:59.135986632 +0200
+--- a/net80211/ieee80211_crypto_tkip.c
++++ b/net80211/ieee80211_crypto_tkip.c
 @@ -57,7 +57,7 @@
  static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int);
@@ -177,10 +174,8 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_tkip.c
  		struct ieee80211vap *vap = ctx->tc_vap;
  		u8 mic[IEEE80211_WEP_MICLEN];
  		u8 mic0[IEEE80211_WEP_MICLEN];
-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_wep.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_wep.c	2007-06-04 13:21:53.016916872 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_wep.c	2007-06-04 13:21:59.135986632 +0200
+--- a/net80211/ieee80211_crypto_wep.c
++++ b/net80211/ieee80211_crypto_wep.c
 @@ -54,7 +54,7 @@
  static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int wep_decap(struct ieee80211_key *, struct sk_buff *, int);
@@ -199,11 +194,9 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_wep.c
  {
  	return 1;
  }
-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c	2007-06-04 13:21:58.897022960 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c	2007-06-04 13:21:59.137986328 +0200
-@@ -632,7 +632,7 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -669,7 +669,7 @@
  		 * Next strip any MSDU crypto bits.
  		 */
  		if (key != NULL &&
@@ -212,12 +205,12 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
  			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
  				ni->ni_macaddr, "data", "%s", "demic error");
  			IEEE80211_NODE_STAT(ni, rx_demicfail);
-@@ -3730,6 +3730,47 @@
+@@ -4293,6 +4293,47 @@
  }
  #endif
  
 +/*
-+ * Process a frame w/ hw detected MIC failure. 
++ * Process a frame w/ hw detected MIC failure.
 + * The frame will be dropped in any case.
 + */
 +void
@@ -229,7 +222,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
 +	struct ieee80211_key *key;
 +	int hdrspace;
 +	struct ieee80211com *ic = vap->iv_ic;
-+	
++
 +	if (skb->len < sizeof(struct ieee80211_frame_min)) {
 +		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 +		    ni->ni_macaddr, NULL,
@@ -239,7 +232,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
 +	}
 +
 +	wh = (struct ieee80211_frame *)skb->data;
-+		
++
 +	hdrspace = ieee80211_hdrspace(ic, wh);
 +	key = ieee80211_crypto_decap(ni, skb, hdrspace);
 +	if (key == NULL) {
@@ -260,11 +253,9 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.
-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_proto.h	2007-06-04 13:21:58.134138936 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h	2007-06-04 13:21:59.137986328 +0200
-@@ -91,6 +91,7 @@
+--- a/net80211/ieee80211_proto.h
++++ b/net80211/ieee80211_proto.h
+@@ -90,6 +90,7 @@
  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,18 +263,59 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h
  
  /*
   * Return the size of the 802.11 header for a management or data frame.
-Index: madwifi-ng-r2420-20070602/net80211/ieee80211_linux.c
-===================================================================
---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_linux.c	2007-06-04 13:21:57.745198064 +0200
-+++ madwifi-ng-r2420-20070602/net80211/ieee80211_linux.c	2007-06-04 13:21:59.137986328 +0200
-@@ -291,8 +291,8 @@
+--- a/net80211/ieee80211_linux.c
++++ b/net80211/ieee80211_linux.c
+@@ -337,8 +337,8 @@
  	/* 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);
+--- a/net80211/ieee80211_output.c
++++ b/net80211/ieee80211_output.c
+@@ -1074,13 +1074,16 @@
+ 			cip = (struct ieee80211_cipher *) key->wk_cipher;
+ 			ciphdrsize = cip->ic_header;
+ 			tailsize += (cip->ic_trailer + cip->ic_miclen);
++
++			/* add the 8 bytes MIC length */
++			if (cip->ic_cipher == IEEE80211_CIPHER_TKIP)
++				pktlen += IEEE80211_WEP_MICLEN;
+ 		}
+ 
+ 		pdusize = vap->iv_fragthreshold - (hdrsize_nopad + ciphdrsize);
+ 		fragcnt = *framecnt =
+-			((pktlen - (hdrsize_nopad + ciphdrsize)) / pdusize) +
+-			(((pktlen - (hdrsize_nopad + ciphdrsize)) %
+-				pdusize == 0) ? 0 : 1);
++			((pktlen - hdrsize_nopad) / pdusize) +
++			(((pktlen - hdrsize_nopad) % pdusize == 0) ? 0 : 1);
+ 
+ 		/*
+ 		 * Allocate sk_buff for each subsequent fragment; First fragment
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
+@@ -2264,11 +2264,13 @@
+ 	/* 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_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_locked(nt, ni);
++		IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
++	}
+ 
+ 	/*
+ 	 * If node wasn't previously associated all