Use ieee80211_drop_unencrypted() to decide whether a received frame
should be dropped with management frames, too. If MFP is negotiated,
unprotected robust management frames will be dropped.
Signed-off-by: Jouni Malinen <[email protected]>
---
net/mac80211/rx.c | 7 +++++++
1 file changed, 7 insertions(+)
--- wireless-testing.orig/net/mac80211/rx.c 2008-12-31 17:17:04.000000000 +0200
+++ wireless-testing/net/mac80211/rx.c 2008-12-31 17:20:37.000000000 +0200
@@ -1703,6 +1703,9 @@ ieee80211_rx_h_action(struct ieee80211_r
if (!(rx->flags & IEEE80211_RX_RA_MATCH))
return RX_DROP_MONITOR;
+ if (ieee80211_drop_unencrypted(rx, mgmt->frame_control))
+ return RX_DROP_MONITOR;
+
/* all categories we currently handle have action_code */
if (len < IEEE80211_MIN_ACTION_SIZE + 1)
return RX_DROP_MONITOR;
@@ -1773,10 +1776,14 @@ static ieee80211_rx_result debug_noinlin
ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev);
+ struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *) rx->skb->data;
if (!(rx->flags & IEEE80211_RX_RA_MATCH))
return RX_DROP_MONITOR;
+ if (ieee80211_drop_unencrypted(rx, mgmt->frame_control))
+ return RX_DROP_MONITOR;
+
if (ieee80211_vif_is_mesh(&sdata->vif))
return ieee80211_mesh_rx_mgmt(sdata, rx->skb, rx->status);
--
--
Jouni Malinen PGP id EFC895FA