mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-22 03:42:05 +03:00
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13096 3c298f89-4303-0410-b956-a3cf2f4a3e73
322 lines
11 KiB
Diff
322 lines
11 KiB
Diff
--- 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 mic_fail = 0;
|
|
|
|
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++;
|
|
- /*
|
|
- * Do minimal work required to hand off
|
|
- * the 802.11 header for notification.
|
|
- */
|
|
- /* XXX frag's and QoS frames */
|
|
- if (len >= sizeof (struct ieee80211_frame)) {
|
|
- bus_dma_sync_single(sc->sc_bdev,
|
|
- bf->bf_skbaddr, len,
|
|
- BUS_DMA_FROMDEVICE);
|
|
-#if 0
|
|
-/* XXX revalidate MIC, lookup ni to find VAP */
|
|
- ieee80211_notify_michael_failure(ic,
|
|
- (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
|
|
@@ -6614,8 +6599,9 @@ rx_accept:
|
|
/*
|
|
* Finished monitor mode handling, now reject
|
|
* error frames before passing to other vaps
|
|
+ * Ignore MIC failures here, as we need to recheck them
|
|
*/
|
|
- if (rs->rs_status != 0) {
|
|
+ if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) {
|
|
ieee80211_dev_kfree_skb(&skb);
|
|
goto rx_next;
|
|
}
|
|
@@ -6623,6 +6609,26 @@ rx_accept:
|
|
/* remove the CRC */
|
|
skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
|
|
|
|
+ if (mic_fail) {
|
|
+ /* 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;
|
|
+ }
|
|
+
|
|
/*
|
|
* 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);
|
|
-static int ccmp_demic(struct ieee80211_key *, struct sk_buff *, int);
|
|
+static int ccmp_demic(struct ieee80211_key *, struct sk_buff *, int, int);
|
|
|
|
static const struct ieee80211_cipher ccmp = {
|
|
.ic_name = "AES-CCM",
|
|
@@ -308,7 +308,7 @@ ccmp_decap(struct ieee80211_key *k, stru
|
|
* Verify and strip MIC from the frame.
|
|
*/
|
|
static int
|
|
-ccmp_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen)
|
|
+ccmp_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen, int force)
|
|
{
|
|
return 1;
|
|
}
|
|
--- 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);
|
|
- int (*ic_demic)(struct ieee80211_key *, struct sk_buff *, int);
|
|
+ int (*ic_demic)(struct ieee80211_key *, struct sk_buff *, int, int);
|
|
};
|
|
extern const struct ieee80211_cipher ieee80211_cipher_none;
|
|
|
|
@@ -163,10 +163,10 @@ struct ieee80211_key *ieee80211_crypto_d
|
|
*/
|
|
static __inline int
|
|
ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k,
|
|
- struct sk_buff *skb, int hdrlen)
|
|
+ struct sk_buff *skb, int hdrlen, int force)
|
|
{
|
|
const struct ieee80211_cipher *cip = k->wk_cipher;
|
|
- return (cip->ic_miclen > 0 ? cip->ic_demic(k, skb, hdrlen) : 1);
|
|
+ return (cip->ic_miclen > 0 ? cip->ic_demic(k, skb, hdrlen, force) : 1);
|
|
}
|
|
|
|
/*
|
|
--- 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);
|
|
-static int none_demic(struct ieee80211_key *, struct sk_buff *, int);
|
|
+static int none_demic(struct ieee80211_key *, struct sk_buff *, int, int);
|
|
|
|
const struct ieee80211_cipher ieee80211_cipher_none = {
|
|
.ic_name = "NONE",
|
|
@@ -137,7 +137,7 @@ none_enmic(struct ieee80211_key *k, stru
|
|
}
|
|
|
|
static int
|
|
-none_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen)
|
|
+none_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen, int force)
|
|
{
|
|
struct ieee80211vap *vap = k->wk_private;
|
|
|
|
--- 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);
|
|
-static int tkip_demic(struct ieee80211_key *, struct sk_buff *, int);
|
|
+static int tkip_demic(struct ieee80211_key *, struct sk_buff *, int, int);
|
|
|
|
static const struct ieee80211_cipher tkip = {
|
|
.ic_name = "TKIP",
|
|
@@ -339,7 +339,7 @@ tkip_decap(struct ieee80211_key *k, stru
|
|
* Verify and strip MIC from the frame.
|
|
*/
|
|
static int
|
|
-tkip_demic(struct ieee80211_key *k, struct sk_buff *skb0, int hdrlen)
|
|
+tkip_demic(struct ieee80211_key *k, struct sk_buff *skb0, int hdrlen, int force)
|
|
{
|
|
struct tkip_ctx *ctx = k->wk_private;
|
|
struct sk_buff *skb;
|
|
@@ -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 */
|
|
- if (k->wk_flags & IEEE80211_KEY_SWMIC) {
|
|
+ if ((k->wk_flags & IEEE80211_KEY_SWMIC) || force) {
|
|
struct ieee80211vap *vap = ctx->tc_vap;
|
|
u8 mic[IEEE80211_WEP_MICLEN];
|
|
u8 mic0[IEEE80211_WEP_MICLEN];
|
|
--- 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);
|
|
-static int wep_demic(struct ieee80211_key *, struct sk_buff *, int);
|
|
+static int wep_demic(struct ieee80211_key *, struct sk_buff *, int, int);
|
|
|
|
static const struct ieee80211_cipher wep = {
|
|
.ic_name = "WEP",
|
|
@@ -244,7 +244,7 @@ wep_decap(struct ieee80211_key *k, struc
|
|
* Verify and strip MIC from the frame.
|
|
*/
|
|
static int
|
|
-wep_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen)
|
|
+wep_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen, int force)
|
|
{
|
|
return 1;
|
|
}
|
|
--- 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 &&
|
|
- !ieee80211_crypto_demic(vap, key, skb, hdrspace)) {
|
|
+ !ieee80211_crypto_demic(vap, key, skb, hdrspace, 0)) {
|
|
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
|
|
ni->ni_macaddr, "data", "%s", "demic error");
|
|
IEEE80211_NODE_STAT(ni, rx_demicfail);
|
|
@@ -4293,6 +4293,47 @@ ath_eth_type_trans(struct sk_buff *skb,
|
|
}
|
|
#endif
|
|
|
|
+/*
|
|
+ * Process a frame w/ hw detected MIC failure.
|
|
+ * The frame will be dropped in any case.
|
|
+ */
|
|
+void
|
|
+ieee80211_check_mic(struct ieee80211_node *ni, struct sk_buff *skb)
|
|
+{
|
|
+ struct ieee80211vap *vap = ni->ni_vap;
|
|
+
|
|
+ struct ieee80211_frame *wh;
|
|
+ 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,
|
|
+ "too short (1): len %u", skb->len);
|
|
+ vap->iv_stats.is_rx_tooshort++;
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ wh = (struct ieee80211_frame *)skb->data;
|
|
+
|
|
+ hdrspace = ieee80211_hdrspace(ic, wh);
|
|
+ key = ieee80211_crypto_decap(ni, skb, hdrspace);
|
|
+ if (key == NULL) {
|
|
+ /* NB: stats+msgs handled in crypto_decap */
|
|
+ IEEE80211_NODE_STAT(ni, rx_wepfail);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (!ieee80211_crypto_demic(vap, key, skb, hdrspace, 1)) {
|
|
+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
|
|
+ ni->ni_macaddr, "data", "%s", "demic error");
|
|
+ IEEE80211_NODE_STAT(ni, rx_demicfail);
|
|
+ }
|
|
+ return;
|
|
+}
|
|
+EXPORT_SYMBOL(ieee80211_check_mic);
|
|
+
|
|
#ifdef IEEE80211_DEBUG
|
|
/*
|
|
* Debugging support.
|
|
--- 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 *);
|
|
+void ieee80211_check_mic(struct ieee80211_node *, struct sk_buff *);
|
|
|
|
/*
|
|
* Return the size of the 802.11 header for a management or data frame.
|
|
--- 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=" MAC_FMT ")", tag,
|
|
k->wk_keyix,
|
|
- IEEE80211_IS_MULTICAST(wh->i_addr1) ? "broad" : "uni",
|
|
- MAC_ADDR(wh->i_addr1));
|
|
+ IEEE80211_IS_MULTICAST(wh->i_addr2) ? "broad" : "uni",
|
|
+ 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 @@ ieee80211_encap(struct ieee80211_node *n
|
|
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 @@ 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_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
|