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

HE: Fix HE Operation element byte order on bigendian CPUs

Browse source 
The first four octets of the element were used as a host byte order u32.
That is not correct on bigendian CPUs, so handle byte swapping needs
properly. Mark the he_oper_params field as le32 to explicitly indicate
the byte order and swap the generated params content based on CPU byte
order.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2019-04-25 23:57:47 +03:00 committed by Jouni Malinen
parent 3869c159d9
commit e6f9eab90e
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/ap/ieee802_11_he.c
View file

@ -62,6 +62,7 @@ u8 * hostapd_eid_he_operation(struct hostapd_data *hapd, u8 *eid)
struct ieee80211_he_operation *oper; struct ieee80211_he_operation *oper;
u8 *pos = eid; u8 *pos = eid;
int oper_size = 6; int oper_size = 6;
u32 params = 0;
if (!hapd->iface->current_mode) if (!hapd->iface->current_mode)
return eid; return eid;
@ -74,25 +75,24 @@ u8 * hostapd_eid_he_operation(struct hostapd_data *hapd, u8 *eid)
os_memset(oper, 0, sizeof(*oper)); os_memset(oper, 0, sizeof(*oper));
if (hapd->iface->conf->he_op.he_default_pe_duration) if (hapd->iface->conf->he_op.he_default_pe_duration)
oper->he_oper_params |= params |= (hapd->iface->conf->he_op.he_default_pe_duration <<
(hapd->iface->conf->he_op.he_default_pe_duration << HE_OPERATION_DFLT_PE_DURATION_OFFSET);
HE_OPERATION_DFLT_PE_DURATION_OFFSET);
if (hapd->iface->conf->he_op.he_twt_required) if (hapd->iface->conf->he_op.he_twt_required)
oper->he_oper_params |= HE_OPERATION_TWT_REQUIRED; params |= HE_OPERATION_TWT_REQUIRED;
if (hapd->iface->conf->he_op.he_rts_threshold) if (hapd->iface->conf->he_op.he_rts_threshold)
oper->he_oper_params |= params |= (hapd->iface->conf->he_op.he_rts_threshold <<
(hapd->iface->conf->he_op.he_rts_threshold << HE_OPERATION_RTS_THRESHOLD_OFFSET);
HE_OPERATION_RTS_THRESHOLD_OFFSET);
if (hapd->iface->conf->he_op.he_bss_color) if (hapd->iface->conf->he_op.he_bss_color)
oper->he_oper_params |= params |= (hapd->iface->conf->he_op.he_bss_color <<
(hapd->iface->conf->he_op.he_bss_color << HE_OPERATION_BSS_COLOR_OFFSET);
HE_OPERATION_BSS_COLOR_OFFSET);
/* TODO: conditional MaxBSSID Indicator subfield */ /* TODO: conditional MaxBSSID Indicator subfield */
oper->he_oper_params = host_to_le32(params);
pos += oper_size; pos += oper_size;
return pos; return pos;

4
src/common/ieee802_11_defs.h
View file

@ -2110,8 +2110,8 @@ struct ieee80211_he_capabilities {
} STRUCT_PACKED; } STRUCT_PACKED;
struct ieee80211_he_operation { struct ieee80211_he_operation {
u32 he_oper_params; /* HE Operation Parameters[3] and le32 he_oper_params; /* HE Operation Parameters[3] and
* BSS Color Information[1] */ * BSS Color Information[1] */
u8 he_mcs_nss_set[2]; u8 he_mcs_nss_set[2];
u8 vht_op_info_chwidth; u8 vht_op_info_chwidth;
u8 vht_op_info_chan_center_freq_seg0_idx; u8 vht_op_info_chan_center_freq_seg0_idx;