UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mac80211: split RX_DROP 

Some instances of RX_DROP mean that the frame was useless,
others mean that the frame should be visible in userspace
on "cooked" monitor interfaces. This patch splits up RX_DROP
and changes each instance appropriately.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2008-01-31 19:48:21 +01:00 committed by John W. Linville
parent 9ae54c8463
commit e4c26add88
5 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/mac80211/ieee80211_i.h
View File

@ -114,9 +114,10 @@ typedef unsigned __bitwise__ ieee80211_tx_result;
#define TX_QUEUED ((__force ieee80211_tx_result) 2u) #define TX_QUEUED ((__force ieee80211_tx_result) 2u)
typedef unsigned __bitwise__ ieee80211_rx_result; typedef unsigned __bitwise__ ieee80211_rx_result;
#define RX_CONTINUE ((__force ieee80211_rx_result) 0u) #define RX_CONTINUE ((__force ieee80211_rx_result) 0u)
#define RX_DROP ((__force ieee80211_rx_result) 1u) #define RX_DROP_UNUSABLE ((__force ieee80211_rx_result) 1u)
#define RX_QUEUED ((__force ieee80211_rx_result) 2u) #define RX_DROP_MONITOR ((__force ieee80211_rx_result) 2u)
#define RX_QUEUED ((__force ieee80211_rx_result) 3u)
/* flags used in struct ieee80211_txrx_data.flags */ /* flags used in struct ieee80211_txrx_data.flags */

4
net/mac80211/ieee80211_sta.c
View File

@ -2567,7 +2567,7 @@ ieee80211_sta_rx_scan(struct net_device *dev, struct sk_buff *skb,
u16 fc; u16 fc;
if (skb->len < 2) if (skb->len < 2)
return RX_DROP; return RX_DROP_UNUSABLE;
mgmt = (struct ieee80211_mgmt *) skb->data; mgmt = (struct ieee80211_mgmt *) skb->data;
fc = le16_to_cpu(mgmt->frame_control); fc = le16_to_cpu(mgmt->frame_control);
@ -2576,7 +2576,7 @@ ieee80211_sta_rx_scan(struct net_device *dev, struct sk_buff *skb,
return RX_CONTINUE; return RX_CONTINUE;
if (skb->len < 24) if (skb->len < 24)
return RX_DROP; return RX_DROP_MONITOR;
if ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) { if ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) {
if ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP) { if ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP) {

59
net/mac80211/rx.c
View File

@ -380,7 +380,7 @@ ieee80211_rx_h_passive_scan(struct ieee80211_txrx_data *rx)
if (unlikely(rx->flags & IEEE80211_TXRXD_RXIN_SCAN)) { if (unlikely(rx->flags & IEEE80211_TXRXD_RXIN_SCAN)) {
/* scanning finished during invoking of handlers */ /* scanning finished during invoking of handlers */
I802_DEBUG_INC(local->rx_handlers_drop_passive_scan); I802_DEBUG_INC(local->rx_handlers_drop_passive_scan);
return RX_DROP; return RX_DROP_UNUSABLE;
} }
return RX_CONTINUE; return RX_CONTINUE;
@ -401,14 +401,14 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
rx->local->dot11FrameDuplicateCount++; rx->local->dot11FrameDuplicateCount++;
rx->sta->num_duplicates++; rx->sta->num_duplicates++;
} }
return RX_DROP; return RX_DROP_MONITOR;
} else } else
rx->sta->last_seq_ctrl[rx->u.rx.queue] = hdr->seq_ctrl; rx->sta->last_seq_ctrl[rx->u.rx.queue] = hdr->seq_ctrl;
} }
if (unlikely(rx->skb->len < 16)) { if (unlikely(rx->skb->len < 16)) {
I802_DEBUG_INC(rx->local->rx_handlers_drop_short); I802_DEBUG_INC(rx->local->rx_handlers_drop_short);
return RX_DROP; return RX_DROP_MONITOR;
} }
/* Drop disallowed frame classes based on STA auth/assoc state; /* Drop disallowed frame classes based on STA auth/assoc state;
@ -430,10 +430,10 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
|| !(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) { || !(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) {
/* Drop IBSS frames and frames for other hosts /* Drop IBSS frames and frames for other hosts
* silently. */ * silently. */
return RX_DROP; return RX_DROP_MONITOR;
} }
return RX_DROP; return RX_DROP_MONITOR;
} }
return RX_CONTINUE; return RX_CONTINUE;
@ -446,7 +446,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx)
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
int keyidx; int keyidx;
int hdrlen; int hdrlen;
ieee80211_rx_result result = RX_DROP; ieee80211_rx_result result = RX_DROP_UNUSABLE;
struct ieee80211_key *stakey = NULL; struct ieee80211_key *stakey = NULL;
/* /*
@ -507,7 +507,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx)
hdrlen = ieee80211_get_hdrlen(rx->fc); hdrlen = ieee80211_get_hdrlen(rx->fc);
if (rx->skb->len < 8 + hdrlen) if (rx->skb->len < 8 + hdrlen)
return RX_DROP; /* TODO: count this? */ return RX_DROP_UNUSABLE; /* TODO: count this? */
/* /*
* no need to call ieee80211_wep_get_keyidx, * no need to call ieee80211_wep_get_keyidx,
@ -536,7 +536,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx)
printk(KERN_DEBUG "%s: RX protected frame," printk(KERN_DEBUG "%s: RX protected frame,"
" but have no key\n", rx->dev->name); " but have no key\n", rx->dev->name);
#endif /* CONFIG_MAC80211_DEBUG */ #endif /* CONFIG_MAC80211_DEBUG */
return RX_DROP; return RX_DROP_MONITOR;
} }
/* Check for weak IVs if possible */ /* Check for weak IVs if possible */
@ -821,7 +821,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
rx->u.rx.queue, hdr); rx->u.rx.queue, hdr);
if (!entry) { if (!entry) {
I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag); I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag);
return RX_DROP; return RX_DROP_MONITOR;
} }
/* Verify that MPDUs within one MSDU have sequential PN values. /* Verify that MPDUs within one MSDU have sequential PN values.
@ -830,7 +830,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
int i; int i;
u8 pn[CCMP_PN_LEN], *rpn; u8 pn[CCMP_PN_LEN], *rpn;
if (!rx->key || rx->key->conf.alg != ALG_CCMP) if (!rx->key || rx->key->conf.alg != ALG_CCMP)
return RX_DROP; return RX_DROP_UNUSABLE;
memcpy(pn, entry->last_pn, CCMP_PN_LEN); memcpy(pn, entry->last_pn, CCMP_PN_LEN);
for (i = CCMP_PN_LEN - 1; i >= 0; i--) { for (i = CCMP_PN_LEN - 1; i >= 0; i--) {
pn[i]++; pn[i]++;
@ -848,7 +848,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
rpn[0], rpn[1], rpn[2], rpn[3], rpn[4], rpn[0], rpn[1], rpn[2], rpn[3], rpn[4],
rpn[5], pn[0], pn[1], pn[2], pn[3], rpn[5], pn[0], pn[1], pn[2], pn[3],
pn[4], pn[5]); pn[4], pn[5]);
return RX_DROP; return RX_DROP_UNUSABLE;
} }
memcpy(entry->last_pn, pn, CCMP_PN_LEN); memcpy(entry->last_pn, pn, CCMP_PN_LEN);
} }
@ -869,7 +869,7 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
GFP_ATOMIC))) { GFP_ATOMIC))) {
I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag); I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag);
__skb_queue_purge(&entry->skb_list); __skb_queue_purge(&entry->skb_list);
return RX_DROP; return RX_DROP_UNUSABLE;
} }
} }
while ((skb = __skb_dequeue(&entry->skb_list))) { while ((skb = __skb_dequeue(&entry->skb_list))) {
@ -906,7 +906,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
if ((sdata->vif.type != IEEE80211_IF_TYPE_AP) && if ((sdata->vif.type != IEEE80211_IF_TYPE_AP) &&
(sdata->vif.type != IEEE80211_IF_TYPE_VLAN)) (sdata->vif.type != IEEE80211_IF_TYPE_VLAN))
return RX_DROP; return RX_DROP_UNUSABLE;
skb = skb_dequeue(&rx->sta->tx_filtered); skb = skb_dequeue(&rx->sta->tx_filtered);
if (!skb) { if (!skb) {
@ -1257,14 +1257,14 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx)
return RX_CONTINUE; return RX_CONTINUE;
if (unlikely(!WLAN_FC_DATA_PRESENT(fc))) if (unlikely(!WLAN_FC_DATA_PRESENT(fc)))
return RX_DROP; return RX_DROP_MONITOR;
if (!(rx->flags & IEEE80211_TXRXD_RX_AMSDU)) if (!(rx->flags & IEEE80211_TXRXD_RX_AMSDU))
return RX_CONTINUE; return RX_CONTINUE;
err = ieee80211_data_to_8023(rx); err = ieee80211_data_to_8023(rx);
if (unlikely(err)) if (unlikely(err))
return RX_DROP; return RX_DROP_UNUSABLE;
skb->dev = dev; skb->dev = dev;
@ -1274,7 +1274,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx)
/* skip the wrapping header */ /* skip the wrapping header */
eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr)); eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr));
if (!eth) if (!eth)
return RX_DROP; return RX_DROP_UNUSABLE;
while (skb != frame) { while (skb != frame) {
u8 padding; u8 padding;
@ -1289,7 +1289,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx)
/* the last MSDU has no padding */ /* the last MSDU has no padding */
if (subframe_len > remaining) { if (subframe_len > remaining) {
printk(KERN_DEBUG "%s: wrong buffer size", dev->name); printk(KERN_DEBUG "%s: wrong buffer size", dev->name);
return RX_DROP; return RX_DROP_UNUSABLE;
} }
skb_pull(skb, sizeof(struct ethhdr)); skb_pull(skb, sizeof(struct ethhdr));
@ -1301,7 +1301,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx)
subframe_len); subframe_len);
if (frame == NULL) if (frame == NULL)
return RX_DROP; return RX_DROP_UNUSABLE;
skb_reserve(frame, local->hw.extra_tx_headroom + skb_reserve(frame, local->hw.extra_tx_headroom +
sizeof(struct ethhdr)); sizeof(struct ethhdr));
@ -1314,7 +1314,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx)
printk(KERN_DEBUG "%s: wrong buffer size ", printk(KERN_DEBUG "%s: wrong buffer size ",
dev->name); dev->name);
dev_kfree_skb(frame); dev_kfree_skb(frame);
return RX_DROP; return RX_DROP_UNUSABLE;
} }
} }
@ -1344,7 +1344,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx)
if (!ieee80211_frame_allowed(rx)) { if (!ieee80211_frame_allowed(rx)) {
if (skb == frame) /* last frame */ if (skb == frame) /* last frame */
return RX_DROP; return RX_DROP_UNUSABLE;
dev_kfree_skb(frame); dev_kfree_skb(frame);
continue; continue;
} }
@ -1367,14 +1367,14 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
return RX_CONTINUE; return RX_CONTINUE;
if (unlikely(!WLAN_FC_DATA_PRESENT(fc))) if (unlikely(!WLAN_FC_DATA_PRESENT(fc)))
return RX_DROP; return RX_DROP_MONITOR;
err = ieee80211_data_to_8023(rx); err = ieee80211_data_to_8023(rx);
if (unlikely(err)) if (unlikely(err))
return RX_DROP; return RX_DROP_UNUSABLE;
if (!ieee80211_frame_allowed(rx)) if (!ieee80211_frame_allowed(rx))
return RX_DROP; return RX_DROP_MONITOR;
rx->skb->dev = dev; rx->skb->dev = dev;
@ -1423,7 +1423,7 @@ ieee80211_rx_h_ctrl(struct ieee80211_txrx_data *rx)
ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, NULL, ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, NULL,
start_seq_num, 1); start_seq_num, 1);
rcu_read_unlock(); rcu_read_unlock();
return RX_DROP; return RX_DROP_UNUSABLE;
} }
return RX_CONTINUE; return RX_CONTINUE;
@ -1435,7 +1435,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx)
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH))
return RX_DROP; return RX_DROP_MONITOR;
sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev); sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev);
if ((sdata->vif.type == IEEE80211_IF_TYPE_STA || if ((sdata->vif.type == IEEE80211_IF_TYPE_STA ||
@ -1443,7 +1443,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx)
!(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME)) !(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME))
ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->u.rx.status); ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->u.rx.status);
else else
return RX_DROP; return RX_DROP_MONITOR;
return RX_QUEUED; return RX_QUEUED;
} }
@ -1455,7 +1455,7 @@ static inline ieee80211_rx_result __ieee80211_invoke_rx_handlers(
struct sta_info *sta) struct sta_info *sta)
{ {
ieee80211_rx_handler *handler; ieee80211_rx_handler *handler;
ieee80211_rx_result res = RX_DROP; ieee80211_rx_result res = RX_DROP_MONITOR;
for (handler = handlers; *handler != NULL; handler++) { for (handler = handlers; *handler != NULL; handler++) {
res = (*handler)(rx); res = (*handler)(rx);
@ -1463,7 +1463,8 @@ static inline ieee80211_rx_result __ieee80211_invoke_rx_handlers(
switch (res) { switch (res) {
case RX_CONTINUE: case RX_CONTINUE:
continue; continue;
case RX_DROP: case RX_DROP_UNUSABLE:
case RX_DROP_MONITOR:
I802_DEBUG_INC(local->rx_handlers_drop); I802_DEBUG_INC(local->rx_handlers_drop);
if (sta) if (sta)
sta->rx_dropped++; sta->rx_dropped++;
@ -1475,7 +1476,7 @@ static inline ieee80211_rx_result __ieee80211_invoke_rx_handlers(
break; break;
} }
if (res == RX_DROP) if (res == RX_DROP_UNUSABLE || res == RX_DROP_MONITOR)
dev_kfree_skb(rx->skb); dev_kfree_skb(rx->skb);
return res; return res;
} }

2
net/mac80211/wep.c
View File

@ -320,7 +320,7 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx)
printk(KERN_DEBUG "%s: RX WEP frame, decrypt " printk(KERN_DEBUG "%s: RX WEP frame, decrypt "
"failed\n", rx->dev->name); "failed\n", rx->dev->name);
#endif /* CONFIG_MAC80211_DEBUG */ #endif /* CONFIG_MAC80211_DEBUG */
return RX_DROP; return RX_DROP_UNUSABLE;
} }
} else if (!(rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED)) { } else if (!(rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED)) {
ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key); ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key);

16
net/mac80211/wpa.c
View File

@ -148,7 +148,7 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx)
if (ieee80211_get_hdr_info(skb, &sa, &da, &qos_tid, &data, &data_len) if (ieee80211_get_hdr_info(skb, &sa, &da, &qos_tid, &data, &data_len)
|| data_len < MICHAEL_MIC_LEN) || data_len < MICHAEL_MIC_LEN)
return RX_DROP; return RX_DROP_UNUSABLE;
data_len -= MICHAEL_MIC_LEN; data_len -= MICHAEL_MIC_LEN;
@ -162,14 +162,14 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx)
michael_mic(key, da, sa, qos_tid & 0x0f, data, data_len, mic); michael_mic(key, da, sa, qos_tid & 0x0f, data, data_len, mic);
if (memcmp(mic, data + data_len, MICHAEL_MIC_LEN) != 0 || wpa_test) { if (memcmp(mic, data + data_len, MICHAEL_MIC_LEN) != 0 || wpa_test) {
if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) if (!(rx->flags & IEEE80211_TXRXD_RXRA_MATCH))
return RX_DROP; return RX_DROP_UNUSABLE;
printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from " printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from "
"%s\n", rx->dev->name, print_mac(mac, sa)); "%s\n", rx->dev->name, print_mac(mac, sa));
mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx, mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx,
(void *) skb->data); (void *) skb->data);
return RX_DROP; return RX_DROP_UNUSABLE;
} }
/* remove Michael MIC from payload */ /* remove Michael MIC from payload */
@ -293,7 +293,7 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx)
return RX_CONTINUE; return RX_CONTINUE;
if (!rx->sta || skb->len - hdrlen < 12) if (!rx->sta || skb->len - hdrlen < 12)
return RX_DROP; return RX_DROP_UNUSABLE;
if (rx->u.rx.status->flag & RX_FLAG_DECRYPTED) { if (rx->u.rx.status->flag & RX_FLAG_DECRYPTED) {
if (rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED) { if (rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED) {
@ -322,7 +322,7 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx)
"frame from %s (res=%d)\n", rx->dev->name, "frame from %s (res=%d)\n", rx->dev->name,
print_mac(mac, rx->sta->addr), res); print_mac(mac, rx->sta->addr), res);
#endif /* CONFIG_MAC80211_DEBUG */ #endif /* CONFIG_MAC80211_DEBUG */
return RX_DROP; return RX_DROP_UNUSABLE;
} }
/* Trim ICV */ /* Trim ICV */
@ -545,7 +545,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx)
data_len = skb->len - hdrlen - CCMP_HDR_LEN - CCMP_MIC_LEN; data_len = skb->len - hdrlen - CCMP_HDR_LEN - CCMP_MIC_LEN;
if (!rx->sta || data_len < 0) if (!rx->sta || data_len < 0)
return RX_DROP; return RX_DROP_UNUSABLE;
if ((rx->u.rx.status->flag & RX_FLAG_DECRYPTED) && if ((rx->u.rx.status->flag & RX_FLAG_DECRYPTED) &&
(rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED)) (rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED))
@ -565,7 +565,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx)
ppn[0], ppn[1], ppn[2], ppn[3], ppn[4], ppn[5]); ppn[0], ppn[1], ppn[2], ppn[3], ppn[4], ppn[5]);
#endif /* CONFIG_MAC80211_DEBUG */ #endif /* CONFIG_MAC80211_DEBUG */
key->u.ccmp.replays++; key->u.ccmp.replays++;
return RX_DROP; return RX_DROP_UNUSABLE;
} }
if (!(rx->u.rx.status->flag & RX_FLAG_DECRYPTED)) { if (!(rx->u.rx.status->flag & RX_FLAG_DECRYPTED)) {
@ -589,7 +589,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx)
"for RX frame from %s\n", rx->dev->name, "for RX frame from %s\n", rx->dev->name,
print_mac(mac, rx->sta->addr)); print_mac(mac, rx->sta->addr));
#endif /* CONFIG_MAC80211_DEBUG */ #endif /* CONFIG_MAC80211_DEBUG */
return RX_DROP; return RX_DROP_UNUSABLE;
} }
} }