diff options
| author | sam <sam@FreeBSD.org> | 2007-03-11 06:52:22 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2007-03-11 06:52:22 +0000 |
| commit | de9f5f66c464d865c8aaaa7e866e8e5117667274 (patch) | |
| tree | 8ab9c2c042ca003fdcccc019d17a5bbe01306df6 /sys/net80211 | |
| parent | f6283342b1c36a92796d07e530dd323b5e2a3a08 (diff) | |
| download | FreeBSD-src-de9f5f66c464d865c8aaaa7e866e8e5117667274.zip FreeBSD-src-de9f5f66c464d865c8aaaa7e866e8e5117667274.tar.gz | |
disallow re-associate with a slot time mismatch
Obtained from: Atheros
MFC after: 2 weeks
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index bb755aa..cfe106e 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1773,6 +1773,21 @@ ieee80211_deliver_l2uf(struct ieee80211_node *ni) ieee80211_deliver_data(ic, ni, m); } +static void +capinfomismatch(struct ieee80211_node *ni, const struct ieee80211_frame *wh, + int reassoc, int resp, const char *tag, int capinfo) +{ + struct ieee80211com *ic = ni->ni_ic; + + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, + "[%s] deny %s request, %s mismatch 0x%x\n", + ether_sprintf(wh->i_addr2), + reassoc ? "reassoc" : "assoc", tag, capinfo); + IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_CAPINFO); + ieee80211_node_leave(ic, ni); + ic->ic_stats.is_rx_assoc_capmismatch++; +} + void ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, struct ieee80211_node *ni, @@ -2346,14 +2361,18 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, } /* NB: 802.11 spec says to ignore station's privacy bit */ if ((capinfo & IEEE80211_CAPINFO_ESS) == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "[%s] deny %s request, capability mismatch 0x%x\n", - ether_sprintf(wh->i_addr2), - reassoc ? "reassoc" : "assoc", capinfo); - IEEE80211_SEND_MGMT(ic, ni, resp, - IEEE80211_STATUS_CAPINFO); - ieee80211_node_leave(ic, ni); - ic->ic_stats.is_rx_assoc_capmismatch++; + capinfomismatch(ni, wh, reassoc, resp, + "capability", capinfo); + return; + } + /* + * Disallow re-associate w/ invalid slot time setting. + */ + if (ni->ni_associd != 0 && + ic->ic_curmode == IEEE80211_MODE_11G && + ((ni->ni_capinfo ^ capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME)) { + capinfomismatch(ni, wh, reassoc, resp, + "slot time", capinfo); return; } rate = ieee80211_setup_rates(ni, rates, xrates, |
