jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Drop unprotected Robust Action frames from MFP STAs

Browse source 
These frames are delivered through mac80211 monitor interface, so we
need to filter them out in hostapd.
This commit is contained in:
Jouni Malinen 2009-05-08 12:51:28 +03:00 committed by Jouni Malinen
parent 9e8cda5a46
commit c4e281fd91
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
hostapd/ieee802_11.c
View file

@ -1366,9 +1366,18 @@ static void hostapd_sa_query_action(struct hostapd_data *hapd,
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
static int robust_action_frame(u8 category)
{
return category != WLAN_ACTION_PUBLIC &&
category != WLAN_ACTION_HT;
}
static void handle_action(struct hostapd_data *hapd, static void handle_action(struct hostapd_data *hapd,
struct ieee80211_mgmt *mgmt, size_t len) struct ieee80211_mgmt *mgmt, size_t len)
{ {
struct sta_info *sta;
if (len < IEEE80211_HDRLEN + 1) { if (len < IEEE80211_HDRLEN + 1) {
hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211, hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_DEBUG, HOSTAPD_LEVEL_DEBUG,
@ -1377,13 +1386,23 @@ static void handle_action(struct hostapd_data *hapd,
return; return;
} }
sta = ap_get_sta(hapd, mgmt->sa);
#ifdef CONFIG_IEEE80211W
if (sta && (sta->flags & WLAN_STA_MFP) &&
!(mgmt->frame_control & host_to_le16(WLAN_FC_ISWEP) &&
robust_action_frame(mgmt->u.action.category))) {
hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_DEBUG,
"Dropped unprotected Robust Action frame from "
"an MFP STA");
return;
}
#endif /* CONFIG_IEEE80211W */
switch (mgmt->u.action.category) { switch (mgmt->u.action.category) {
#ifdef CONFIG_IEEE80211R #ifdef CONFIG_IEEE80211R
case WLAN_ACTION_FT: case WLAN_ACTION_FT:
{ {
struct sta_info *sta;
sta = ap_get_sta(hapd, mgmt->sa);
if (sta == NULL || !(sta->flags & WLAN_STA_ASSOC)) { if (sta == NULL || !(sta->flags & WLAN_STA_ASSOC)) {
wpa_printf(MSG_DEBUG, "IEEE 802.11: Ignored FT Action " wpa_printf(MSG_DEBUG, "IEEE 802.11: Ignored FT Action "
"frame from unassociated STA " MACSTR, "frame from unassociated STA " MACSTR,

2
src/common/ieee802_11_defs.h
View file

@ -214,8 +214,10 @@
#define WLAN_ACTION_QOS 1 #define WLAN_ACTION_QOS 1
#define WLAN_ACTION_DLS 2 #define WLAN_ACTION_DLS 2
#define WLAN_ACTION_BLOCK_ACK 3 #define WLAN_ACTION_BLOCK_ACK 3
#define WLAN_ACTION_PUBLIC 4
#define WLAN_ACTION_RADIO_MEASUREMENT 5 #define WLAN_ACTION_RADIO_MEASUREMENT 5
#define WLAN_ACTION_FT 6 #define WLAN_ACTION_FT 6
#define WLAN_ACTION_HT 7
#define WLAN_ACTION_SA_QUERY 8 #define WLAN_ACTION_SA_QUERY 8
#define WLAN_ACTION_WMM 17 /* WMM Specification 1.1 */ #define WLAN_ACTION_WMM 17 /* WMM Specification 1.1 */