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

RRM: Set last beacon report indication in the last element only

Browse source 
The last beacon report indication was set in all the beacon report
elements in the last frame of the beacon report, while it should be
set only in the last beacon report element of the last frame.

Fixes: ecef0687dc ("RRM: Support for Last Beacon Report Indication subelement")
Signed-off-by: Avraham Stern <avraham.stern@intel.com>
This commit is contained in:
Avraham Stern 2019-04-03 20:38:49 +03:00 committed by Jouni Malinen
parent 6f484978fb
commit 56ac1f9dfe
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
wpa_supplicant/rrm.c
View file

@ -397,7 +397,10 @@ static int wpas_rrm_beacon_rep_update_last_frame(u8 *pos, size_t len)
struct rrm_measurement_report_element *msr_rep;
u8 *end = pos + len;
u8 *msr_rep_end;
struct rrm_measurement_beacon_report *rep = NULL;
u8 *subelem;
/* Find the last beacon report element */
while (end - pos >= (int) sizeof(*msr_rep)) {
msr_rep = (struct rrm_measurement_report_element *) pos;
msr_rep_end = pos + msr_rep->len + 2;
@ -410,30 +413,27 @@ static int wpas_rrm_beacon_rep_update_last_frame(u8 *pos, size_t len)
return -1;
}
if (msr_rep->type == MEASURE_TYPE_BEACON) {
struct rrm_measurement_beacon_report *rep;
u8 *subelem;
if (msr_rep->type == MEASURE_TYPE_BEACON)
rep = (struct rrm_measurement_beacon_report *)
msr_rep->variable;
subelem = rep->variable;
while (subelem + 2 < msr_rep_end &&
subelem[0] !=
WLAN_BEACON_REPORT_SUBELEM_LAST_INDICATION)
subelem += 2 + subelem[1];
if (subelem + 2 < msr_rep_end &&
subelem[0] ==
WLAN_BEACON_REPORT_SUBELEM_LAST_INDICATION &&
subelem[1] == 1 &&
subelem +
BEACON_REPORT_LAST_INDICATION_SUBELEM_LEN <= end)
subelem[2] = 1;
}
pos += pos[1] + 2;
}
if (!rep)
return 0;
subelem = rep->variable;
while (subelem + 2 < msr_rep_end &&
subelem[0] != WLAN_BEACON_REPORT_SUBELEM_LAST_INDICATION)
subelem += 2 + subelem[1];
if (subelem + 2 < msr_rep_end &&
subelem[0] == WLAN_BEACON_REPORT_SUBELEM_LAST_INDICATION &&
subelem[1] == 1 &&
subelem + BEACON_REPORT_LAST_INDICATION_SUBELEM_LEN <= end)
subelem[2] = 1;
return 0;
}