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

ieee802_11_mgmt: Handle frame info more consistently

Browse source 
Check for the fi parameter to be non-NULL before trying to fetch the
ssi_signal information similarly to how the fi->freq was already
handled. While the meta information is supposed to be available, it
looks like there is at least one corner case where fi == NULL could be
used (Authentication frame reprocessing after RADIUS-based ACL).

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2018-02-07 12:34:41 +02:00
parent 458d8984de
commit 659ac96d7f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ap/ieee802_11.c
View file

@ -3829,6 +3829,7 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
u16 fc, stype; u16 fc, stype;
int ret = 0; int ret = 0;
unsigned int freq; unsigned int freq;
int ssi_signal = fi ? fi->ssi_signal : 0;
if (len < 24) if (len < 24)
return 0; return 0;
@ -3864,7 +3865,7 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
if (stype == WLAN_FC_STYPE_PROBE_REQ) { if (stype == WLAN_FC_STYPE_PROBE_REQ) {
handle_probe_req(hapd, mgmt, len, fi->ssi_signal); handle_probe_req(hapd, mgmt, len, ssi_signal);
return 1; return 1;
} }
@ -3879,7 +3880,7 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
} }
if (hapd->iconf->track_sta_max_num) if (hapd->iconf->track_sta_max_num)
sta_track_add(hapd->iface, mgmt->sa, fi->ssi_signal); sta_track_add(hapd->iface, mgmt->sa, ssi_signal);
switch (stype) { switch (stype) {
case WLAN_FC_STYPE_AUTH: case WLAN_FC_STYPE_AUTH: