Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 17:59:25 +01:00
Code Releases Activity

netdev: disambiguate between disconnection types

Browse Source 
There are generally three scenarios where iwd generates a disconnection
command to the kernel:
  1. Error conditions stemming from a connection related event.  For
     example if SAE/FT/FILS authentication fails during Authenticate or
     Associate steps and the kernel doesn't disconnect properly.
  2. Deauthentication after the connection has been established and not
     related to a connection attempt in progress.  For example, SA Query
     processing that triggers an disconnect.
  3. Disconnects that are triggered due to a handshake failure or if
     setting keys resulting from the handshake fails.  These disconnects
     can be triggered as a result of a pending connection or when a
     connection has been established (e.g. due to rekeying).

Distinguish between 1 and 2/3 by having the disconnect procedure take
different paths.  For now there are no functional changes since all
paths end up in netdev_connect_failed(), but this will change in the
future.
This commit is contained in:
Denis Kenzior 2023-11-14 09:14:36 -06:00
parent 28798990d2
commit c59669a366
1 changed files with 76 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/netdev.c
View File

@ -858,7 +858,7 @@ static void netdev_connect_failed(struct netdev *netdev,
} }
} }
static void netdev_disconnect_cb(struct l_genl_msg *msg, void *user_data) static void netdev_connect_failed_cb(struct l_genl_msg *msg, void *user_data)
{ {
struct netdev *netdev = user_data; struct netdev *netdev = user_data;
@ -866,6 +866,63 @@ static void netdev_disconnect_cb(struct l_genl_msg *msg, void *user_data)
netdev_connect_failed(netdev, netdev->result, netdev->last_code); netdev_connect_failed(netdev, netdev->result, netdev->last_code);
} }
static void netdev_send_and_fail_connection(struct netdev *netdev,
enum netdev_result result,
uint16_t status_code,
struct l_genl_msg *msg)
{
netdev->result = result;
netdev->last_code = status_code;
netdev->disconnect_cmd_id =
l_genl_family_send(nl80211, msg, netdev_connect_failed_cb,
netdev, NULL);
}
static void netdev_disconnect_and_fail_connection(struct netdev *netdev,
enum netdev_result result,
uint16_t status_code)
{
struct l_genl_msg *msg = nl80211_build_disconnect(netdev->index,
MMPDU_REASON_CODE_UNSPECIFIED);
netdev_send_and_fail_connection(netdev, result, status_code, msg);
}
static void netdev_deauth_and_fail_connection(struct netdev *netdev,
enum netdev_result result,
uint16_t status_code)
{
struct l_genl_msg *msg = nl80211_build_deauthenticate(netdev->index,
netdev->handshake->aa,
MMPDU_REASON_CODE_UNSPECIFIED);
netdev_send_and_fail_connection(netdev, result, status_code, msg);
}
static void netdev_disconnect_by_sme_cb(struct l_genl_msg *msg, void *user_data)
{
struct netdev *netdev = user_data;
netdev->disconnect_cmd_id = 0;
netdev_connect_failed(netdev, netdev->result, netdev->last_code);
}
static void netdev_disconnect_by_sme(struct netdev *netdev,
enum netdev_result result,
uint16_t reason_code)
{
struct l_genl_msg *msg = nl80211_build_disconnect(netdev->index,
reason_code);
netdev->result = result;
netdev->last_code = reason_code;
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_disconnect_by_sme_cb,
netdev, NULL);
}
static void netdev_free(void *data) static void netdev_free(void *data)
{ {
struct netdev *netdev = data; struct netdev *netdev = data;
@ -1388,11 +1445,9 @@ static void netdev_setting_keys_failed(struct netdev_handshake_state *nhs,
return; return;
} }
msg = nl80211_build_disconnect(netdev->index, netdev_disconnect_by_sme(netdev,
NETDEV_RESULT_KEY_SETTING_FAILED,
MMPDU_REASON_CODE_UNSPECIFIED); MMPDU_REASON_CODE_UNSPECIFIED);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_disconnect_cb,
netdev, NULL);
break; break;
case NL80211_IFTYPE_AP: case NL80211_IFTYPE_AP:
if (err == -ENETDOWN) if (err == -ENETDOWN)
@ -1407,7 +1462,6 @@ static void netdev_setting_keys_failed(struct netdev_handshake_state *nhs,
break; break;
} }
netdev->result = NETDEV_RESULT_KEY_SETTING_FAILED;
handshake_event(&nhs->super, HANDSHAKE_EVENT_SETTING_KEYS_FAILED, &err); handshake_event(&nhs->super, HANDSHAKE_EVENT_SETTING_KEYS_FAILED, &err);
} }
@ -2118,16 +2172,11 @@ void netdev_handshake_failed(struct handshake_state *hs, uint16_t reason_code)
netdev->sm = NULL; netdev->sm = NULL;
netdev->result = NETDEV_RESULT_HANDSHAKE_FAILED;
netdev->last_code = reason_code;
switch (netdev->type) { switch (netdev->type) {
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_P2P_CLIENT:
msg = nl80211_build_disconnect(netdev->index, reason_code); netdev_disconnect_by_sme(netdev, NETDEV_RESULT_HANDSHAKE_FAILED,
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg, reason_code);
netdev_disconnect_cb,
netdev, NULL);
break; break;
case NL80211_IFTYPE_AP: case NL80211_IFTYPE_AP:
case NL80211_IFTYPE_P2P_GO: case NL80211_IFTYPE_P2P_GO:
@ -2842,14 +2891,9 @@ error:
return; return;
deauth: deauth:
netdev->result = NETDEV_RESULT_ASSOCIATION_FAILED; netdev_disconnect_and_fail_connection(netdev,
netdev->last_code = MMPDU_STATUS_CODE_UNSPECIFIED; NETDEV_RESULT_ASSOCIATION_FAILED,
msg = nl80211_build_disconnect(netdev->index, MMPDU_STATUS_CODE_UNSPECIFIED);
MMPDU_REASON_CODE_UNSPECIFIED);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211,
msg,
netdev_disconnect_cb,
netdev, NULL);
} }
static struct l_genl_msg *netdev_build_cmd_associate_common( static struct l_genl_msg *netdev_build_cmd_associate_common(
@ -2890,19 +2934,12 @@ static void netdev_cmd_ft_reassociate_cb(struct l_genl_msg *msg,
netdev->connect_cmd_id = 0; netdev->connect_cmd_id = 0;
if (l_genl_msg_get_error(msg) < 0) { if (l_genl_msg_get_error(msg) >= 0)
struct l_genl_msg *cmd_deauth; return;
netdev->result = NETDEV_RESULT_ASSOCIATION_FAILED; netdev_deauth_and_fail_connection(netdev,
netdev->last_code = MMPDU_STATUS_CODE_UNSPECIFIED; NETDEV_RESULT_ASSOCIATION_FAILED,
cmd_deauth = nl80211_build_deauthenticate(netdev->index, MMPDU_STATUS_CODE_UNSPECIFIED);
netdev->handshake->aa,
MMPDU_REASON_CODE_UNSPECIFIED);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211,
cmd_deauth,
netdev_disconnect_cb,
netdev, NULL);
}
} }
static bool kernel_will_retry_auth(uint16_t status_code, static bool kernel_will_retry_auth(uint16_t status_code,
@ -3027,17 +3064,9 @@ static void netdev_authenticate_event(struct l_genl_msg *msg,
* to keep retrying, tell it to stop * to keep retrying, tell it to stop
*/ */
if (retry) { if (retry) {
struct l_genl_msg *cmd_deauth; netdev_deauth_and_fail_connection(netdev,
NETDEV_RESULT_ASSOCIATION_FAILED,
netdev->result = NETDEV_RESULT_ASSOCIATION_FAILED; MMPDU_STATUS_CODE_UNSPECIFIED);
netdev->last_code = MMPDU_STATUS_CODE_UNSPECIFIED;
cmd_deauth = nl80211_build_deauthenticate(netdev->index,
netdev->handshake->aa,
MMPDU_REASON_CODE_UNSPECIFIED);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211,
cmd_deauth,
netdev_disconnect_cb,
netdev, NULL);
return; return;
} }
} }
@ -4545,17 +4574,14 @@ static void netdev_sa_query_timeout(struct l_timeout *timeout,
void *user_data) void *user_data)
{ {
struct netdev *netdev = user_data; struct netdev *netdev = user_data;
struct l_genl_msg *msg;
l_info("SA Query timed out, connection is invalid. Disconnecting..."); l_info("SA Query timed out, connection is invalid. Disconnecting...");
l_timeout_remove(netdev->sa_query_timeout); l_timeout_remove(netdev->sa_query_timeout);
netdev->sa_query_timeout = NULL; netdev->sa_query_timeout = NULL;
msg = nl80211_build_disconnect(netdev->index, netdev_disconnect_by_sme(netdev, NETDEV_RESULT_ABORTED,
MMPDU_REASON_CODE_PREV_AUTH_NOT_VALID); MMPDU_REASON_CODE_PREV_AUTH_NOT_VALID);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_disconnect_cb, netdev, NULL);
} }
static void netdev_sa_query_req_cb(struct l_genl_msg *msg, void *user_data) static void netdev_sa_query_req_cb(struct l_genl_msg *msg, void *user_data)