nl80211cmd: add NL80211_CMD_ASSOC_COMEBACK
PATCH 1/3 nl80211cmd: add NL80211_CMD_ASSOC_COMEBACK
--- src/nl80211cmd.c | 1 + 1 file changed, 1 insertion(+)
src/nl80211cmd.c +1 -0
@@ -177,6 +177,7 @@ static const struct { { NL80211_CMD_UNPROT_BEACON, "Unprotected Beacon" }, { NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS, "Control Port TX Status" }, + { NL80211_CMD_ASSOC_COMEBACK, "Association comeback delay" }, { } };
Signature · 1 line
2.34.1
PATCH 2/3 nl80211util: support parsing NL80211_ATTR_TIMEOUT
--- src/nl80211util.c | 1 + 1 file changed, 1 insertion(+)
src/nl80211util.c +1 -0
@@ -190,6 +190,7 @@ static attr_handler handler_for_nl80211(int type)case NL80211_ATTR_CENTER_FREQ2 :case NL80211_ATTR_AKM_SUITES :case NL80211_ATTR_EXTERNAL_AUTH_ACTION : +case NL80211_ATTR_TIMEOUT :return extract_uint32;case NL80211_ATTR_FRAME :return extract_iovec;
Signature · 1 line
2.34.1
PATCH 3/3 netdev: support handling NL80211_CMD_ASSOC_COMEBACK
In reply to James PrestwoodA BSS can temporarily reject associations and provide a delay that the station should wait for before retrying. This is useful when sane values are used, but taking it to the extreme an AP could potentially request the client wait UINT32_MAX TU's which equates to 49 days.
Either due to a bug, or worse by design, the kernel will wait for however long that timeout is. Luckily the kernel also sends an event to userspace with the amount of time it will be waiting. To guard against excessive timeouts IWD will now handle this event and enforce a maximum allowed value. If the timeout exceeds this IWD will deauthenticate.
--- src/netdev.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
src/netdev.c +36 -0
@@ -5451,6 +5451,39 @@ static void netdev_michael_mic_failure(struct l_genl_msg *msg,l_debug ("ifindex=%u key_idx=%u type=%u" , netdev->index, idx, type); } +#define MAX_COMEBACK_DELAY 1200 + +static void netdev_assoc_comeback (struct l_genl_msg *msg, +struct netdev *netdev) +{ +const uint8_t *mac; +uint32_t timeout; + +if (L_WARN_ON (!netdev->connected)) +return ; + +if (nl80211_parse_attrs (msg,NL80211_ATTR_MAC , &mac, +NL80211_ATTR_TIMEOUT , &timeout, +NL80211_ATTR_UNSPEC ) <0 ) +return ; + +if (L_WARN_ON (memcmp (mac, netdev->handshake->aa,ETH_ALEN ))) +return ; + +if (timeout <=MAX_COMEBACK_DELAY ) { +l_debug (MAC " requested an association comeback delay of %u TU" , +MAC_STR (netdev->handshake->aa), timeout); +return ; + } + +l_debug ("Comeback delay of %u exceeded maximum of %u, deauthenticating" , + timeout,MAX_COMEBACK_DELAY ); + +netdev_deauth_and_fail_connection (netdev, +NETDEV_RESULT_ASSOCIATION_FAILED , +MMPDU_STATUS_CODE_REFUSED_TEMPORARILY ); +} +static void netdev_mlme_notify (struct l_genl_msg *msg,void *user_data) {struct netdev *netdev =NULL ;
@@ -5504,6 +5537,9 @@ static void netdev_mlme_notify(struct l_genl_msg *msg, void *user_data)case NL80211_CMD_MICHAEL_MIC_FAILURE :netdev_michael_mic_failure (msg, netdev);break ; +case NL80211_CMD_ASSOC_COMEBACK : +netdev_assoc_comeback (msg, netdev); +break ; } }
Signature · 1 line
2.34.1
Hi James,
Quoted 4 lines · James Prestwood
--- src/nl80211cmd.c | 1 + 1 file changed, 1 insertion(+)
All applied, thanks.
Regards,
-Denis