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

nl80211: Avoid sending unsupported attributes

Browse source 
The kernel will reject commands if newer attributes are included even
though they should not be. Add appropriate checks in set_ap().

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
This commit is contained in:
Benjamin Berg 2023-12-28 15:14:06 +02:00 committed by Jouni Malinen
parent 7fec9e7bc1
commit 5ae010aae5
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/drivers/driver_nl80211.c
View file

@ -5194,7 +5194,9 @@ static int wpa_driver_nl80211_set_ap(void *priv,
flags |= NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT;
if (nla_put_u32(msg, NL80211_ATTR_AP_SETTINGS_FLAGS, flags))
if (nl80211_attr_supported(drv,
NL80211_ATTR_AP_SETTINGS_FLAGS) &&
nla_put_u32(msg, NL80211_ATTR_AP_SETTINGS_FLAGS, flags))
goto fail;
}
@ -5328,7 +5330,8 @@ static int wpa_driver_nl80211_set_ap(void *priv,
if (params->freq && nl80211_put_freq_params(msg, params->freq) < 0)
goto fail;
if (params->freq && params->freq->he_enabled) {
if (params->freq && params->freq->he_enabled &&
nl80211_attr_supported(drv, NL80211_ATTR_HE_BSS_COLOR)) {
struct nlattr *bss_color;
bss_color = nla_nest_start(msg, NL80211_ATTR_HE_BSS_COLOR);

6
src/drivers/driver_nl80211.h
View file

@ -353,6 +353,12 @@ const char * nl80211_iftype_str(enum nl80211_iftype mode);
void nl80211_restore_ap_mode(struct i802_bss *bss);
struct i802_link * nl80211_get_link(struct i802_bss *bss, s8 link_id);
static inline bool
nl80211_attr_supported(struct wpa_driver_nl80211_data *drv, unsigned int attr)
{
return attr <= drv->global->nl80211_maxattr;
}
#ifdef ANDROID
int android_nl_socket_set_nonblocking(struct nl_sock *handle);
int android_pno_start(struct i802_bss *bss,