ap: check FULL_AP_CLIENT_STATE for NEW_STATION
PATCH v2 1/2 ap: check FULL_AP_CLIENT_STATE for NEW_STATION
nl80211 has a check which returns -EINVAL for NEW_STATION if this feature is not enabled and the mask contains Authenticated/Associated flags.
--- src/ap.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
src/ap.c +10 -7
@@ -1643,19 +1643,22 @@ static struct l_genl_msg *ap_build_cmd_new_station(struct sta_state *sta) {struct l_genl_msg *msg;uint32_t ifindex =netdev_get_ifindex (sta->ap->netdev); -/* -* This should hopefully work both with and without -* NL80211_FEATURE_FULL_AP_CLIENT_STATE. -*/ struct nl80211_sta_flag_update flags = { - .mask = (1 <<NL80211_STA_FLAG_AUTHENTICATED ) | - (1 <<NL80211_STA_FLAG_ASSOCIATED ) | - (1 <<NL80211_STA_FLAG_AUTHORIZED ) | + .mask = (1 <<NL80211_STA_FLAG_AUTHORIZED ) | (1 <<NL80211_STA_FLAG_MFP ), .set = (1 <<NL80211_STA_FLAG_AUTHENTICATED ) | (1 <<NL80211_STA_FLAG_ASSOCIATED ), }; +/* +* Without this feature nl80211 rejects NEW_STATION if the mask contains +* auth/assoc flags +*/ +if (wiphy_has_feature (netdev_get_wiphy (sta->ap->netdev), +NL80211_FEATURE_FULL_AP_CLIENT_STATE )) + flags.mask |= (1 <<NL80211_STA_FLAG_ASSOCIATED ) | + (1 <<NL80211_STA_FLAG_AUTHENTICATED ); + msg =l_genl_msg_new_sized (NL80211_CMD_NEW_STATION ,300 );l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &ifindex);
Signature · 1 line
2.34.3
PATCH v2 2/2 ap: handle -ENOTSUP when getting the GTK
Some hardware does not support this, so use a zero RSC in this case rather than failing the association.
--- src/ap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
v2:
* Instead, jump to the !gtk_rsc if block to memset and set the pointer
src/ap.c +6 -1
@@ -1499,14 +1499,19 @@ static void ap_gtk_query_cb(struct l_genl_msg *msg, void *user_data)struct sta_state *sta = user_data;const void *gtk_rsc;uint8_t zero_gtk_rsc[6 ]; +int err; sta->gtk_query_cmd_id =0 ; -if (l_genl_msg_get_error (msg) <0 ) + err =l_genl_msg_get_error (msg); +if (err == -ENOTSUP ) + goto zero_rsc; +else if (err <0 ) goto error; gtk_rsc =nl80211_parse_get_key_seq (msg);if (!gtk_rsc) { +zero_rsc:memset (zero_gtk_rsc,0 ,6 ); gtk_rsc = zero_gtk_rsc; }
Signature · 1 line
2.34.3
Hi James,
Quoted 6 lines · James Prestwood
nl80211 has a check which returns
-EINVALforNEW_STATIONif this feature is not enabled and the mask contains Authenticated/Associated flags.--- src/ap.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
Both applied, thanks.
Regards,
-Denis