1 diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
2 --- madwifi.old/ath/if_ath.c 2007-06-01 11:39:53.078678000 +0200
3 +++ madwifi.dev/ath/if_ath.c 2007-06-01 11:50:32.819422992 +0200
6 u_int processed = 0, early_stop = 0;
7 u_int rx_limit = dev->quota;
10 /* Let the 802.11 layer know about the new noise floor */
11 sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
12 @@ -5698,25 +5699,7 @@
14 if (rs->rs_status & HAL_RXERR_MIC) {
15 sc->sc_stats.ast_rx_badmic++;
17 - * Do minimal work required to hand off
18 - * the 802.11 header for notification.
20 - /* XXX frag's and QoS frames */
21 - len = rs->rs_datalen;
22 - if (len >= sizeof (struct ieee80211_frame)) {
23 - bus_dma_sync_single(sc->sc_bdev,
24 - bf->bf_skbaddr, len,
25 - BUS_DMA_FROMDEVICE);
27 -/* XXX revalidate MIC, lookup ni to find VAP */
28 - ieee80211_notify_michael_failure(ic,
29 - (struct ieee80211_frame *) skb->data,
31 - rs->rs_keyix - 32 : rs->rs_keyix
38 * Reject error frames if we have no vaps that
41 * Finished monitor mode handling, now reject
42 * error frames before passing to other vaps
43 + * Ignore MIC failures here, as we need to recheck them
45 - if (rs->rs_status != 0) {
46 + if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) {
50 @@ -5806,6 +5790,20 @@
51 sc->sc_hwmap[rs->rs_rate].ieeerate,
54 + /* MIC failure. Drop the packet in any case */
56 + ni = ieee80211_find_rxnode(ic,
57 + (const struct ieee80211_frame_min *) skb->data);
59 + ieee80211_check_mic(ni, skb);
60 + ieee80211_unref_node(&ni);
62 + dev_kfree_skb_any(skb);
69 * Locate the node for sender, track state, and then
70 * pass the (referenced) node up to the 802.11 layer
71 diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee80211_crypto_ccmp.c
72 --- madwifi.old/net80211/ieee80211_crypto_ccmp.c 2007-05-30 03:41:18.000000000 +0200
73 +++ madwifi.dev/net80211/ieee80211_crypto_ccmp.c 2007-06-01 11:45:05.000259080 +0200
75 static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
76 static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int);
77 static int ccmp_enmic(struct ieee80211_key *, struct sk_buff *, int);
78 -static int ccmp_demic(struct ieee80211_key *, struct sk_buff *, int);
79 +static int ccmp_demic(struct ieee80211_key *, struct sk_buff *, int, int);
81 static const struct ieee80211_cipher ccmp = {
84 * Verify and strip MIC from the frame.
87 -ccmp_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen)
88 +ccmp_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen, int force)
92 diff -ur madwifi.old/net80211/ieee80211_crypto.h madwifi.dev/net80211/ieee80211_crypto.h
93 --- madwifi.old/net80211/ieee80211_crypto.h 2007-04-16 14:32:29.000000000 +0200
94 +++ madwifi.dev/net80211/ieee80211_crypto.h 2007-06-01 11:45:05.000259080 +0200
96 int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
97 int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
98 int (*ic_enmic)(struct ieee80211_key *, struct sk_buff *, int);
99 - int (*ic_demic)(struct ieee80211_key *, struct sk_buff *, int);
100 + int (*ic_demic)(struct ieee80211_key *, struct sk_buff *, int, int);
102 extern const struct ieee80211_cipher ieee80211_cipher_none;
104 @@ -163,10 +163,10 @@
107 ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k,
108 - struct sk_buff *skb, int hdrlen)
109 + struct sk_buff *skb, int hdrlen, int force)
111 const struct ieee80211_cipher *cip = k->wk_cipher;
112 - return (cip->ic_miclen > 0 ? cip->ic_demic(k, skb, hdrlen) : 1);
113 + return (cip->ic_miclen > 0 ? cip->ic_demic(k, skb, hdrlen, force) : 1);
117 diff -ur madwifi.old/net80211/ieee80211_crypto_none.c madwifi.dev/net80211/ieee80211_crypto_none.c
118 --- madwifi.old/net80211/ieee80211_crypto_none.c 2006-09-20 10:45:13.000000000 +0200
119 +++ madwifi.dev/net80211/ieee80211_crypto_none.c 2007-06-01 11:45:05.000259080 +0200
121 static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
122 static int none_decap(struct ieee80211_key *, struct sk_buff *, int);
123 static int none_enmic(struct ieee80211_key *, struct sk_buff *, int);
124 -static int none_demic(struct ieee80211_key *, struct sk_buff *, int);
125 +static int none_demic(struct ieee80211_key *, struct sk_buff *, int, int);
127 const struct ieee80211_cipher ieee80211_cipher_none = {
133 -none_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen)
134 +none_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen, int force)
136 struct ieee80211vap *vap = k->wk_private;
138 diff -ur madwifi.old/net80211/ieee80211_crypto_tkip.c madwifi.dev/net80211/ieee80211_crypto_tkip.c
139 --- madwifi.old/net80211/ieee80211_crypto_tkip.c 2007-05-30 03:41:18.000000000 +0200
140 +++ madwifi.dev/net80211/ieee80211_crypto_tkip.c 2007-06-01 11:45:05.001258928 +0200
142 static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
143 static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int);
144 static int tkip_decap(struct ieee80211_key *, struct sk_buff *, int);
145 -static int tkip_demic(struct ieee80211_key *, struct sk_buff *, int);
146 +static int tkip_demic(struct ieee80211_key *, struct sk_buff *, int, int);
148 static const struct ieee80211_cipher tkip = {
151 * Verify and strip MIC from the frame.
154 -tkip_demic(struct ieee80211_key *k, struct sk_buff *skb0, int hdrlen)
155 +tkip_demic(struct ieee80211_key *k, struct sk_buff *skb0, int hdrlen, int force)
157 struct tkip_ctx *ctx = k->wk_private;
161 wh = (struct ieee80211_frame *) skb0->data;
162 /* NB: skb left pointing at last in chain */
163 - if (k->wk_flags & IEEE80211_KEY_SWMIC) {
164 + if ((k->wk_flags & IEEE80211_KEY_SWMIC) || force) {
165 struct ieee80211vap *vap = ctx->tc_vap;
166 u8 mic[IEEE80211_WEP_MICLEN];
167 u8 mic0[IEEE80211_WEP_MICLEN];
168 diff -ur madwifi.old/net80211/ieee80211_crypto_wep.c madwifi.dev/net80211/ieee80211_crypto_wep.c
169 --- madwifi.old/net80211/ieee80211_crypto_wep.c 2007-05-29 23:55:25.000000000 +0200
170 +++ madwifi.dev/net80211/ieee80211_crypto_wep.c 2007-06-01 11:45:05.001258928 +0200
172 static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
173 static int wep_decap(struct ieee80211_key *, struct sk_buff *, int);
174 static int wep_enmic(struct ieee80211_key *, struct sk_buff *, int);
175 -static int wep_demic(struct ieee80211_key *, struct sk_buff *, int);
176 +static int wep_demic(struct ieee80211_key *, struct sk_buff *, int, int);
178 static const struct ieee80211_cipher wep = {
181 * Verify and strip MIC from the frame.
184 -wep_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen)
185 +wep_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen, int force)
189 diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
190 --- madwifi.old/net80211/ieee80211_input.c 2007-06-01 11:31:46.931583000 +0200
191 +++ madwifi.dev/net80211/ieee80211_input.c 2007-06-01 11:45:05.003258624 +0200
193 * Next strip any MSDU crypto bits.
196 - !ieee80211_crypto_demic(vap, key, skb, hdrspace)) {
197 + !ieee80211_crypto_demic(vap, key, skb, hdrspace, 0)) {
198 IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
199 ni->ni_macaddr, "data", "%s", "demic error");
200 IEEE80211_NODE_STAT(ni, rx_demicfail);
201 @@ -3744,6 +3744,47 @@
206 + * Process a frame w/ hw detected MIC failure.
207 + * The frame will be dropped in any case.
210 +ieee80211_check_mic(struct ieee80211_node *ni, struct sk_buff *skb)
212 + struct ieee80211vap *vap = ni->ni_vap;
214 + struct ieee80211_frame *wh;
215 + struct ieee80211_key *key;
217 + struct ieee80211com *ic = vap->iv_ic;
219 + if (skb->len < sizeof(struct ieee80211_frame_min)) {
220 + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
221 + ni->ni_macaddr, NULL,
222 + "too short (1): len %u", skb->len);
223 + vap->iv_stats.is_rx_tooshort++;
227 + wh = (struct ieee80211_frame *)skb->data;
229 + hdrspace = ieee80211_hdrspace(ic, wh);
230 + key = ieee80211_crypto_decap(ni, skb, hdrspace);
232 + /* NB: stats+msgs handled in crypto_decap */
233 + IEEE80211_NODE_STAT(ni, rx_wepfail);
237 + if (!ieee80211_crypto_demic(vap, key, skb, hdrspace, 1)) {
238 + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
239 + ni->ni_macaddr, "data", "%s", "demic error");
240 + IEEE80211_NODE_STAT(ni, rx_demicfail);
244 +EXPORT_SYMBOL(ieee80211_check_mic);
246 #ifdef IEEE80211_DEBUG
249 diff -ur madwifi.old/net80211/ieee80211_linux.c madwifi.dev/net80211/ieee80211_linux.c
250 --- madwifi.old/net80211/ieee80211_linux.c 2007-05-30 03:41:18.000000000 +0200
251 +++ madwifi.dev/net80211/ieee80211_linux.c 2007-06-01 11:45:05.003258624 +0200
254 /* TODO: needed parameters: count, keyid, key type, src address, TSC */
255 snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
256 - keyix, IEEE80211_IS_MULTICAST(wh->i_addr1) ? "broad" : "uni",
257 - ether_sprintf(wh->i_addr1));
258 + keyix, IEEE80211_IS_MULTICAST(wh->i_addr2) ? "broad" : "uni",
259 + ether_sprintf(wh->i_addr2));
260 memset(&wrqu, 0, sizeof(wrqu));
261 wrqu.data.length = strlen(buf);
262 wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
263 diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h
264 --- madwifi.old/net80211/ieee80211_proto.h 2007-06-01 11:26:04.172691000 +0200
265 +++ madwifi.dev/net80211/ieee80211_proto.h 2007-06-01 11:45:05.004258472 +0200
267 void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
268 enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
269 void ieee80211_send_pspoll(struct ieee80211_node *);
270 +void ieee80211_check_mic(struct ieee80211_node *, struct sk_buff *);
273 * Return the size of the 802.11 header for a management or data frame.