DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

MBO: Check association disallowed in Beacon frames, if newer

Browse source 
When a station receives either a Beacon frame or a Probe Response frame
from an AP that contains an MBO element with the Association Disallowed
attribute, the station should prevent association to that AP. When using
passive scanning, it is possible for the scan results to contain the
latest information in the Beacon frame elements instead of the Probe
Response frame elements. That could result in using old information and
not noticing the AP having changed its state to disallowing new
associations.

Make it more likely to follow the AP's change to disallow associations
by checking the Beacon frame elements instead of Probe Response frame
elements if the scan results are known to contain newer information for
the Beacon frame.

Signed-off-by: Kuan-Chung Chen <damon.chen@realtek.com>
This commit is contained in:
Kuan-Chung Chen 2022-01-28 17:25:46 +08:00 committed by Jouni Malinen
parent 284e3ad196
commit 734fa392f7
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wpa_supplicant/events.c
View file

@ -1454,7 +1454,7 @@ static bool wpa_scan_res_ok(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
if (wpa_s->ignore_assoc_disallow) if (wpa_s->ignore_assoc_disallow)
goto skip_assoc_disallow; goto skip_assoc_disallow;
#endif /* CONFIG_TESTING_OPTIONS */ #endif /* CONFIG_TESTING_OPTIONS */
assoc_disallow = wpas_mbo_get_bss_attr(bss, MBO_ATTR_ID_ASSOC_DISALLOW); assoc_disallow = wpas_mbo_check_assoc_disallow(bss);
if (assoc_disallow && assoc_disallow[1] >= 1) { if (assoc_disallow && assoc_disallow[1] >= 1) {
if (debug_print) if (debug_print)
wpa_dbg(wpa_s, MSG_DEBUG, wpa_dbg(wpa_s, MSG_DEBUG,

23
wpa_supplicant/mbo.c
View file

@ -65,13 +65,17 @@ const u8 * mbo_get_attr_from_ies(const u8 *ies, size_t ies_len,
} }
const u8 * wpas_mbo_get_bss_attr(struct wpa_bss *bss, enum mbo_attr_id attr) static const u8 * wpas_mbo_get_bss_attr(struct wpa_bss *bss,
enum mbo_attr_id attr, bool beacon)
{ {
const u8 *mbo, *end; const u8 *mbo, *end;
if (!bss) if (!bss)
return NULL; return NULL;
if (beacon)
mbo = wpa_bss_get_vendor_ie_beacon(bss, MBO_IE_VENDOR_TYPE);
else
mbo = wpa_bss_get_vendor_ie(bss, MBO_IE_VENDOR_TYPE); mbo = wpa_bss_get_vendor_ie(bss, MBO_IE_VENDOR_TYPE);
if (!mbo) if (!mbo)
return NULL; return NULL;
@ -83,6 +87,19 @@ const u8 * wpas_mbo_get_bss_attr(struct wpa_bss *bss, enum mbo_attr_id attr)
} }
const u8 * wpas_mbo_check_assoc_disallow(struct wpa_bss *bss)
{
const u8 *assoc_disallow;
assoc_disallow = wpas_mbo_get_bss_attr(bss, MBO_ATTR_ID_ASSOC_DISALLOW,
bss->beacon_newer);
if (assoc_disallow && assoc_disallow[1] >= 1)
return assoc_disallow;
return NULL;
}
void wpas_mbo_check_pmf(struct wpa_supplicant *wpa_s, struct wpa_bss *bss, void wpas_mbo_check_pmf(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
struct wpa_ssid *ssid) struct wpa_ssid *ssid)
{ {
@ -92,8 +109,8 @@ void wpas_mbo_check_pmf(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
wpa_s->disable_mbo_oce = 0; wpa_s->disable_mbo_oce = 0;
if (!bss) if (!bss)
return; return;
mbo = wpas_mbo_get_bss_attr(bss, MBO_ATTR_ID_AP_CAPA_IND); mbo = wpas_mbo_get_bss_attr(bss, MBO_ATTR_ID_AP_CAPA_IND, false);
oce = wpas_mbo_get_bss_attr(bss, OCE_ATTR_ID_CAPA_IND); oce = wpas_mbo_get_bss_attr(bss, OCE_ATTR_ID_CAPA_IND, false);
if (!mbo && !oce) if (!mbo && !oce)
return; return;
if (oce && oce[1] >= 1 && (oce[2] & OCE_IS_STA_CFON)) if (oce && oce[1] >= 1 && (oce[2] & OCE_IS_STA_CFON))

2
wpa_supplicant/wpa_supplicant_i.h
View file

@ -1686,7 +1686,7 @@ void wpa_supplicant_reset_bgscan(struct wpa_supplicant *wpa_s);
int wpas_mbo_ie(struct wpa_supplicant *wpa_s, u8 *buf, size_t len, int wpas_mbo_ie(struct wpa_supplicant *wpa_s, u8 *buf, size_t len,
int add_oce_capa); int add_oce_capa);
const u8 * mbo_attr_from_mbo_ie(const u8 *mbo_ie, enum mbo_attr_id attr); const u8 * mbo_attr_from_mbo_ie(const u8 *mbo_ie, enum mbo_attr_id attr);
const u8 * wpas_mbo_get_bss_attr(struct wpa_bss *bss, enum mbo_attr_id attr); const u8 * wpas_mbo_check_assoc_disallow(struct wpa_bss *bss);
void wpas_mbo_check_pmf(struct wpa_supplicant *wpa_s, struct wpa_bss *bss, void wpas_mbo_check_pmf(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
struct wpa_ssid *ssid); struct wpa_ssid *ssid);
const u8 * mbo_get_attr_from_ies(const u8 *ies, size_t ies_len, const u8 * mbo_get_attr_from_ies(const u8 *ies, size_t ies_len,