netdev: Fix obtaining reason code from deauth frames
PATCH 1/11 netdev: Fix obtaining reason code from deauth frames
The reason code from deauthentication frame was being obtained as a uint8_t instead of a uint16_t. The value was only ever used in an informational statement. Since the value was in little endian, only the first 8 bits of the reason code were obtained. Fix that.
--- src/netdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
src/netdev.c +3 -1
@@ -1264,6 +1264,7 @@ static void netdev_deauthenticate_event(struct l_genl_msg *msg,uint16_t type, len;const void *data;const struct mmpdu_header *hdr =NULL ; +const struct mmpdu_deauthentication *deauth;uint16_t reason_code;l_debug ("" );
@@ -1298,7 +1299,8 @@ static void netdev_deauthenticate_event(struct l_genl_msg *msg,if (!memcmp (hdr->address_2, netdev->addr,sizeof (netdev->addr)))return ; - reason_code =l_get_u8 (mmpdu_body (hdr)); + deauth =mmpdu_body (hdr); + reason_code =L_LE16_TO_CPU (deauth->reason_code); l_info("deauth event, src="MAC" dest="MAC" bssid="MAC" reason=%u", MAC_STR(hdr->address_2), MAC_STR(hdr->address_1),
Signature · 1 line
2.42.0
PATCH 2/11 netdev: sa_query: Fix reason code handling
The reason code field was being obtained as a uint8_t value, while it is actually a uint16_t in little-endian byte order.
--- src/netdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
src/netdev.c +1 -2
@@ -4956,8 +4956,7 @@ static void netdev_unprot_disconnect_event(struct l_genl_msg *msg,if (!hdr)return ; -/* get reason code, first byte of frame */ - reason_code =l_get_u8 (mmpdu_body (hdr)); + reason_code =l_get_le16 (mmpdu_body (hdr)); l_info("disconnect event, src="MAC" dest="MAC" bssid="MAC" reason=%u", MAC_STR(hdr->address_2), MAC_STR(hdr->address_1),
Signature · 1 line
2.42.0
PATCH 3/11 netdev: Use CMD_DISCONNECT if OCI fails
In reply to Denis KenziorIf netdev_get_oci fails, a goto deauth is invoked in order to terminate the current connection and return an error to the caller. Unfortunately the deauth label builds CMD_DEAUTHENTICATE in order to terminate the connection. This was fine because it used to handle authentication protocols that ran over CMD_AUTHENTICATE and CMD_ASSOCIATE. However, OCI can also be used on FullMAC hardware that does not support them. Use CMD_DISCONNECT instead which works everywhere.
--- src/netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/netdev.c +1 -1
@@ -2989,7 +2989,7 @@ error: deauth: netdev->result =NETDEV_RESULT_ASSOCIATION_FAILED ; netdev->last_code =MMPDU_STATUS_CODE_UNSPECIFIED ; - msg =netdev_build_cmd_deauthenticate (netdev, + msg =netdev_build_cmd_disconnect (netdev,MMPDU_REASON_CODE_UNSPECIFIED ); netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
Signature · 1 line
2.42.0
PATCH 4/11 netdev: Don't unnecessarily call netdev_connect_failed
In reply to Denis Kenziornetdev_begin_connection() already invokes netdev_connect_failed on error. Remove any calls to netdev_connect_failed in callers of netdev_begin_connection().
--- src/netdev.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-)
src/netdev.c +11 -19
@@ -3605,19 +3605,16 @@ static void netdev_mac_change_failed(struct netdev *netdev, int error)WATCHLIST_NOTIFY (&netdev_watches, netdev_watch_func_t, netdev,NETDEV_WATCH_EVENT_DOWN ); - goto failed; - }else { -/* If the interface is up we can still try and connect */ -l_info ("Failed to change the MAC, continuing with connection" ); -if (netdev_begin_connection (netdev) <0 ) - goto failed; - +netdev_connect_failed (netdev,NETDEV_RESULT_ABORTED , +MMPDU_STATUS_CODE_UNSPECIFIED );return ; } -failed: -netdev_connect_failed (netdev,NETDEV_RESULT_ABORTED , -MMPDU_STATUS_CODE_UNSPECIFIED ); +/* If the interface is up we can still try and connect */ +l_info ("Failed to change the MAC, continuing with connection" ); + +if (netdev_begin_connection (netdev) <0 ) +l_error ("netdev_begin_connection() error in mac_change_failed" ); }static void netdev_mac_destroy (void *user_data)
@@ -3649,14 +3646,9 @@ static void netdev_mac_power_up_cb(int error, uint16_t type,return ; } -/* -* Pick up where we left off in netdev_connect_commmon. -*/ -if (netdev_begin_connection (netdev) <0 ) { -l_error ("Failed to connect after changing MAC" ); -netdev_connect_failed (netdev,NETDEV_RESULT_ASSOCIATION_FAILED , -MMPDU_STATUS_CODE_UNSPECIFIED ); - } +/* Pick up where we left off in netdev_connect_commmon */ +if (netdev_begin_connection (netdev) <0 ) +l_error ("netdev_begin_connection() error in mac_power_up_cb" ); } static void netdev_mac_power_down_cb(int error, uint16_t type,
@@ -3870,7 +3862,7 @@ static bool netdev_connection_work_ready(struct wiphy_radio_work_item *item) }if (netdev_begin_connection (netdev) <0 ) - goto failed; +return true;return false;
Signature · 1 line
2.42.0
PATCH 5/11 netdev: Move CMD_DISCONNECT builder to nl80211util
In reply to Denis Kenzior--- src/netdev.c | 22 +++++----------------- src/nl80211util.c | 12 ++++++++++++ src/nl80211util.h | 3 +++ 3 files changed, 20 insertions(+), 17 deletions(-)
src/netdev.c +5 -17
@@ -1245,18 +1245,6 @@ static void netdev_cmd_disconnect_cb(struct l_genl_msg *msg, void *user_data)disconnect_cb (netdev, r, disconnect_data); } -static struct l_genl_msg *netdev_build_cmd_disconnect (struct netdev *netdev, -uint16_t reason_code) -{ -struct l_genl_msg *msg; - - msg =l_genl_msg_new_sized (NL80211_CMD_DISCONNECT ,64 ); -l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &netdev->index); -l_genl_msg_append_attr (msg,NL80211_ATTR_REASON_CODE ,2 , &reason_code); - -return msg; -} -static void netdev_deauthenticate_event (struct l_genl_msg *msg,struct netdev *netdev) {
@@ -1460,7 +1448,7 @@ static void netdev_setting_keys_failed(struct netdev_handshake_state *nhs,return ; } - msg =netdev_build_cmd_disconnect (netdev, + msg =nl80211_build_disconnect (netdev->index,MMPDU_REASON_CODE_UNSPECIFIED ); netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg, netdev_disconnect_cb,
@@ -2246,7 +2234,7 @@ void netdev_handshake_failed(struct handshake_state *hs, uint16_t reason_code)switch (netdev->type) {case NL80211_IFTYPE_STATION :case NL80211_IFTYPE_P2P_CLIENT : - msg =netdev_build_cmd_disconnect (netdev, reason_code); + msg =nl80211_build_disconnect (netdev->index, reason_code); netdev->disconnect_cmd_id =l_genl_family_send (nl80211, msg, netdev_disconnect_cb, netdev,NULL );
@@ -2989,7 +2977,7 @@ error: deauth: netdev->result =NETDEV_RESULT_ASSOCIATION_FAILED ; netdev->last_code =MMPDU_STATUS_CODE_UNSPECIFIED ; - msg =netdev_build_cmd_disconnect (netdev, + msg =nl80211_build_disconnect (netdev->index,MMPDU_REASON_CODE_UNSPECIFIED ); netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
@@ -4159,7 +4147,7 @@ int netdev_disconnect(struct netdev *netdev, }if (send_disconnect) { - disconnect =netdev_build_cmd_disconnect (netdev, + disconnect =nl80211_build_disconnect (netdev->index,MMPDU_REASON_CODE_DEAUTH_LEAVING ); netdev->disconnect_cmd_id = l_genl_family_send(nl80211, disconnect, netdev_cmd_disconnect_cb,
@@ -4695,7 +4683,7 @@ static void netdev_sa_query_timeout(struct l_timeout *timeout,l_timeout_remove (netdev->sa_query_timeout); netdev->sa_query_timeout =NULL ; - msg =netdev_build_cmd_disconnect (netdev, + msg =nl80211_build_disconnect (netdev->index,MMPDU_REASON_CODE_PREV_AUTH_NOT_VALID ); netdev->disconnect_cmd_id =l_genl_family_send (nl80211, msg, netdev_disconnect_cb, netdev,NULL );
src/nl80211util.c +12 -0
@@ -284,6 +284,18 @@ done:return ret; } +struct l_genl_msg *nl80211_build_disconnect (uint32_t ifindex, +uint16_t reason_code) +{ +struct l_genl_msg *msg; + + msg =l_genl_msg_new_sized (NL80211_CMD_DISCONNECT ,64 ); +l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &ifindex); +l_genl_msg_append_attr (msg,NL80211_ATTR_REASON_CODE ,2 , &reason_code); + +return msg; +} + struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, uint32_t cipher, uint8_t key_id, const uint8_t *key, size_t key_len, const uint8_t *ctr,
src/nl80211util.h +3 -0
@@ -28,6 +28,9 @@ struct band_freq_attrs;int nl80211_parse_attrs (struct l_genl_msg *msg,int tag, ...); +struct l_genl_msg *nl80211_build_disconnect (uint32_t ifindex, +uint16_t reason_code); + struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, uint32_t cipher, uint8_t key_id, const uint8_t *key, size_t key_len,
Signature · 1 line
2.42.0
PATCH 6/11 netdev: Move CMD_DEAUTHENTICATE builder to nl80211util
In reply to Denis Kenzior--- src/netdev.c | 20 ++++---------------- src/nl80211util.c | 14 ++++++++++++++ src/nl80211util.h | 3 +++ 3 files changed, 21 insertions(+), 16 deletions(-)
src/netdev.c +4 -16
@@ -1298,20 +1298,6 @@ static void netdev_deauthenticate_event(struct l_genl_msg *msg, MMPDU_STATUS_CODE_UNSPECIFIED); } -static struct l_genl_msg *netdev_build_cmd_deauthenticate (struct netdev *netdev, -uint16_t reason_code) -{ -struct l_genl_msg *msg; - - msg =l_genl_msg_new_sized (NL80211_CMD_DEAUTHENTICATE ,128 ); -l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &netdev->index); -l_genl_msg_append_attr (msg,NL80211_ATTR_REASON_CODE ,2 , &reason_code); -l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , - netdev->handshake->aa); - -return msg; -} - static struct l_genl_msg *netdev_build_cmd_del_station(struct netdev *netdev, const uint8_t *sta, uint16_t reason_code,
@@ -3028,7 +3014,8 @@ static void netdev_cmd_ft_reassociate_cb(struct l_genl_msg *msg, netdev->result =NETDEV_RESULT_ASSOCIATION_FAILED ; netdev->last_code =MMPDU_STATUS_CODE_UNSPECIFIED ; - cmd_deauth =netdev_build_cmd_deauthenticate (netdev, + 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,
@@ -3163,7 +3150,8 @@ static void netdev_authenticate_event(struct l_genl_msg *msg, netdev->result =NETDEV_RESULT_ASSOCIATION_FAILED ; netdev->last_code =MMPDU_STATUS_CODE_UNSPECIFIED ; - cmd_deauth =netdev_build_cmd_deauthenticate (netdev, + 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,
src/nl80211util.c +14 -0
@@ -284,6 +284,20 @@ done:return ret; } +struct l_genl_msg *nl80211_build_deauthenticate (uint32_t ifindex, +const uint8_t addr[static 6 ], +uint16_t reason_code) +{ +struct l_genl_msg *msg; + + msg =l_genl_msg_new_sized (NL80211_CMD_DEAUTHENTICATE ,128 ); +l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &ifindex); +l_genl_msg_append_attr (msg,NL80211_ATTR_REASON_CODE ,2 , &reason_code); +l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , addr); + +return msg; +} +struct l_genl_msg *nl80211_build_disconnect (uint32_t ifindex,uint16_t reason_code) {
src/nl80211util.h +3 -0
@@ -28,6 +28,9 @@ struct band_freq_attrs;int nl80211_parse_attrs (struct l_genl_msg *msg,int tag, ...); +struct l_genl_msg *nl80211_build_deauthenticate (uint32_t ifindex, +const uint8_t addr[static 6 ], +uint16_t reason_code);struct l_genl_msg *nl80211_build_disconnect (uint32_t ifindex,uint16_t reason_code);
Signature · 1 line
2.42.0
PATCH 7/11 netdev: Move CMD_DEL_STATION builder to nl80211util
In reply to Denis KenziorWhile here, also get rid of netdev_del_station. The only user of this function was in ap.c and it could easily be replaced by invoking the new nl80211_build_del_station function. The callback used by netdev_build_del_station only printed an error and didn't do anything useful. Get rid of it for now.
--- src/ap.c | 9 +++++++- src/netdev.c | 56 +++++------------------------------------------ src/nl80211util.c | 16 ++++++++++++++ src/nl80211util.h | 5 +++++ 4 files changed, 35 insertions(+), 51 deletions(-)
src/ap.c +8 -1
@@ -392,10 +392,17 @@ static void ap_del_station(struct sta_state *sta, uint16_t reason, bool disassociate) {struct ap_state *ap = sta->ap; +uint32_t ifindex =netdev_get_ifindex (ap->netdev);struct ap_event_station_removed_data event_data;bool send_event = false; +struct l_genl_msg *msg; +uint8_t subtype = disassociate ? +MPDU_MANAGEMENT_SUBTYPE_DISASSOCIATION : +MPDU_MANAGEMENT_SUBTYPE_DEAUTHENTICATION ; + + msg =nl80211_build_del_station (ifindex, sta->addr, reason, subtype); +l_genl_family_send (ap->nl80211, msg,NULL ,NULL ,NULL ); -netdev_del_station (ap->netdev, sta->addr, reason, disassociate); sta->associated = false;if (sta->rsna) {
src/netdev.c +6 -50
74 lines not on this page · raw message
src/nl80211util.c +16 -0
@@ -310,6 +310,22 @@ struct l_genl_msg *nl80211_build_disconnect(uint32_t ifindex,return msg; } +struct l_genl_msg *nl80211_build_del_station (uint32_t ifindex, +const uint8_t addr[static 6 ], +uint16_t reason_code, +uint8_t subtype) +{ +struct l_genl_msg *msg; + + msg =l_genl_msg_new_sized (NL80211_CMD_DEL_STATION ,64 ); +l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &ifindex); +l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,6 , addr); +l_genl_msg_append_attr (msg,NL80211_ATTR_MGMT_SUBTYPE ,1 , &subtype); +l_genl_msg_append_attr (msg,NL80211_ATTR_REASON_CODE ,2 , &reason_code); + +return msg; +} + struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, uint32_t cipher, uint8_t key_id, const uint8_t *key, size_t key_len, const uint8_t *ctr,
src/nl80211util.h +5 -0
@@ -34,6 +34,11 @@ struct l_genl_msg *nl80211_build_deauthenticate(uint32_t ifindex,struct l_genl_msg *nl80211_build_disconnect (uint32_t ifindex,uint16_t reason_code); +struct l_genl_msg *nl80211_build_del_station (uint32_t ifindex, +const uint8_t addr[static 6 ], +uint16_t reason_code, +uint8_t subtype); + struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, uint32_t cipher, uint8_t key_id, const uint8_t *key, size_t key_len,
Signature · 1 line
2.42.0
PATCH 8/11 netdev: Move pairwise NEW_KEY builder to nl80211util
In reply to Denis Kenzior--- src/netdev.c | 27 +++------------------------ src/nl80211util.c | 20 ++++++++++++++++++++ src/nl80211util.h | 6 ++++++ 3 files changed, 29 insertions(+), 24 deletions(-)
src/netdev.c +3 -24
@@ -1898,27 +1898,6 @@ error:netdev_setting_keys_failed (nhs, err); } -static struct l_genl_msg *netdev_build_cmd_new_key_pairwise ( -struct netdev *netdev, -uint32_t cipher, -const uint8_t *aa, -const uint8_t *tk, -size_t tk_len, -uint8_t key_id) -{ -struct l_genl_msg *msg; - - msg =l_genl_msg_new_sized (NL80211_CMD_NEW_KEY ,512 ); - -l_genl_msg_append_attr (msg,NL80211_ATTR_KEY_DATA , tk_len, tk); -l_genl_msg_append_attr (msg,NL80211_ATTR_KEY_CIPHER ,4 , &cipher); -l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , aa); -l_genl_msg_append_attr (msg,NL80211_ATTR_KEY_IDX ,1 , &key_id); -l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &netdev->index); - -return msg; -} - static struct l_genl_msg *netdev_build_cmd_new_rx_key_pairwise( struct netdev *netdev, uint32_t cipher,
@@ -2024,9 +2003,9 @@ static void netdev_set_tk(struct handshake_state *hs, uint8_t key_index,if (!netdev_copy_tk (tk_buf, tk, cipher, hs->authenticator)) goto invalid_key; - msg =netdev_build_cmd_new_key_pairwise (netdev, cipher, addr, tk_buf, -crypto_cipher_key_len (cipher), - key_index); + msg =nl80211_build_new_key_pairwise (netdev->index, cipher, addr, + tk_buf,crypto_cipher_key_len (cipher), + key_index); nhs->pairwise_new_key_cmd_id =l_genl_family_send (nl80211, msg, netdev_new_pairwise_key_cb, nhs,NULL );
src/nl80211util.c +20 -0
@@ -359,6 +359,26 @@ struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, uint32_t cipherreturn msg; } +struct l_genl_msg *nl80211_build_new_key_pairwise (uint32_t ifindex, +uint32_t cipher, +const uint8_t addr[static 6 ], +const uint8_t *tk, +size_t tk_len, +uint8_t key_id) +{ +struct l_genl_msg *msg; + + msg =l_genl_msg_new_sized (NL80211_CMD_NEW_KEY ,512 ); + +l_genl_msg_append_attr (msg,NL80211_ATTR_KEY_DATA , tk_len, tk); +l_genl_msg_append_attr (msg,NL80211_ATTR_KEY_CIPHER ,4 , &cipher); +l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , addr); +l_genl_msg_append_attr (msg,NL80211_ATTR_KEY_IDX ,1 , &key_id); +l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &ifindex); + +return msg; +} +static struct l_genl_msg *nl80211_build_set_station (uint32_t ifindex,const uint8_t *addr,struct nl80211_sta_flag_update *flags)
src/nl80211util.h +6 -0
@@ -44,6 +44,12 @@ struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, const uint8_t *key, size_t key_len, const uint8_t *ctr, size_t ctr_len, const uint8_t *addr); +struct l_genl_msg *nl80211_build_new_key_pairwise (uint32_t ifindex, +uint32_t cipher, +const uint8_t addr[static 6 ], +const uint8_t *tk, +size_t tk_len, +uint8_t key_id);struct l_genl_msg *nl80211_build_set_station_authorized (uint32_t ifindex,const uint8_t *addr);
Signature · 1 line
2.42.0
PATCH 9/11 netdev: Move CMD_NEW_KEY RX-only builder to nl80211util
In reply to Denis Kenzior--- src/netdev.c | 36 +++--------------------------------- src/nl80211util.c | 29 +++++++++++++++++++++++++++++ src/nl80211util.h | 6 ++++++ 3 files changed, 38 insertions(+), 33 deletions(-)
src/netdev.c +3 -33
@@ -1898,36 +1898,6 @@ error:netdev_setting_keys_failed (nhs, err); } -static struct l_genl_msg *netdev_build_cmd_new_rx_key_pairwise ( -struct netdev *netdev, -uint32_t cipher, -const uint8_t *aa, -const uint8_t *tk, -size_t tk_len, -uint8_t key_id) -{ -uint8_t key_mode =NL80211_KEY_NO_TX ; -uint32_t key_type =NL80211_KEYTYPE_PAIRWISE ; -struct l_genl_msg *msg; - - msg =l_genl_msg_new_sized (NL80211_CMD_NEW_KEY ,512 ); - -l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , aa); -l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &netdev->index); - -l_genl_msg_enter_nested (msg,NL80211_ATTR_KEY ); - -l_genl_msg_append_attr (msg,NL80211_KEY_DATA , tk_len, tk); -l_genl_msg_append_attr (msg,NL80211_KEY_CIPHER ,4 , &cipher); -l_genl_msg_append_attr (msg,NL80211_KEY_IDX ,1 , &key_id); -l_genl_msg_append_attr (msg,NL80211_KEY_MODE ,1 , &key_mode); -l_genl_msg_append_attr (msg,NL80211_KEY_TYPE ,4 , &key_type); - -l_genl_msg_leave_nested (msg); - -return msg; -} -static void netdev_group_timeout_cb (struct l_timeout *timeout,void *user_data) {struct netdev_handshake_state *nhs = user_data;
@@ -2037,9 +2007,9 @@ static void netdev_set_ext_tk(struct handshake_state *hs, uint8_t key_idx,if (!netdev_copy_tk (tk_buf, tk, cipher, hs->authenticator)) goto error; - msg =netdev_build_cmd_new_rx_key_pairwise (netdev, cipher, addr, tk_buf, -crypto_cipher_key_len (cipher), - hs->active_tk_index); + msg =nl80211_build_new_rx_key_pairwise (netdev->index, cipher, addr, + tk_buf,crypto_cipher_key_len (cipher), + hs->active_tk_index); nhs->pairwise_new_key_cmd_id =l_genl_family_send (nl80211, msg, netdev_new_rx_pairwise_key_cb, nhs,NULL );
src/nl80211util.c +29 -0
@@ -379,6 +379,35 @@ struct l_genl_msg *nl80211_build_new_key_pairwise(uint32_t ifindex,return msg; } +struct l_genl_msg *nl80211_build_new_rx_key_pairwise (uint32_t ifindex, +uint32_t cipher, +const uint8_t addr[static 6 ], +const uint8_t *tk, +size_t tk_len, +uint8_t key_id) +{ +uint8_t key_mode =NL80211_KEY_NO_TX ; +uint32_t key_type =NL80211_KEYTYPE_PAIRWISE ; +struct l_genl_msg *msg; + + msg =l_genl_msg_new_sized (NL80211_CMD_NEW_KEY ,512 ); + +l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , addr); +l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &ifindex); + +l_genl_msg_enter_nested (msg,NL80211_ATTR_KEY ); + +l_genl_msg_append_attr (msg,NL80211_KEY_DATA , tk_len, tk); +l_genl_msg_append_attr (msg,NL80211_KEY_CIPHER ,4 , &cipher); +l_genl_msg_append_attr (msg,NL80211_KEY_IDX ,1 , &key_id); +l_genl_msg_append_attr (msg,NL80211_KEY_MODE ,1 , &key_mode); +l_genl_msg_append_attr (msg,NL80211_KEY_TYPE ,4 , &key_type); + +l_genl_msg_leave_nested (msg); + +return msg; +} +static struct l_genl_msg *nl80211_build_set_station (uint32_t ifindex,const uint8_t *addr,struct nl80211_sta_flag_update *flags)
src/nl80211util.h +6 -0
@@ -50,6 +50,12 @@ struct l_genl_msg *nl80211_build_new_key_pairwise(uint32_t ifindex,const uint8_t *tk, size_t tk_len, uint8_t key_id); +struct l_genl_msg *nl80211_build_new_rx_key_pairwise (uint32_t ifindex, +uint32_t cipher, +const uint8_t addr[static 6 ], +const uint8_t *tk, +size_t tk_len, +uint8_t key_id);struct l_genl_msg *nl80211_build_set_station_authorized (uint32_t ifindex,const uint8_t *addr);
Signature · 1 line
2.42.0
PATCH 10/11 netdev: Move CMD_REKEY_OFFLOAD builder to nl80211util
In reply to Denis Kenzior--- src/netdev.c | 26 +------------------------- src/nl80211util.c | 24 ++++++++++++++++++++++++ src/nl80211util.h | 5 +++++ 3 files changed, 30 insertions(+), 25 deletions(-)
src/netdev.c +1 -25
@@ -2163,30 +2163,6 @@ static void hardware_rekey_cb(struct l_genl_msg *msg, void *data) } } -static struct l_genl_msg *netdev_build_cmd_replay_counter (struct netdev *netdev, -const uint8_t *kek, -const uint8_t *kck, -uint64_t replay_ctr) -{ -struct l_genl_msg *msg; - - msg =l_genl_msg_new_sized (NL80211_CMD_SET_REKEY_OFFLOAD ,512 ); - -l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &netdev->index); - -l_genl_msg_enter_nested (msg,NL80211_ATTR_REKEY_DATA ); -l_genl_msg_append_attr (msg,NL80211_REKEY_DATA_KEK , -NL80211_KEK_LEN , kek); -l_genl_msg_append_attr (msg,NL80211_REKEY_DATA_KCK , -NL80211_KCK_LEN , kck); -l_genl_msg_append_attr (msg,NL80211_REKEY_DATA_REPLAY_CTR , -NL80211_REPLAY_CTR_LEN , &replay_ctr); - -l_genl_msg_leave_nested (msg); - -return msg; -} - static void netdev_set_rekey_offload(uint32_t ifindex, const uint8_t *kek, const uint8_t *kck,
@@ -2207,7 +2183,7 @@ static void netdev_set_rekey_offload(uint32_t ifindex,return ;l_debug ("%d" , netdev->index); - msg =netdev_build_cmd_replay_counter (netdev, kek, kck, replay_counter); + msg =nl80211_build_rekey_offload (ifindex, kek, kck, replay_counter); netdev->rekey_offload_cmd_id =l_genl_family_send (nl80211, msg, hardware_rekey_cb, netdev,NULL );
src/nl80211util.c +24 -0
@@ -408,6 +408,30 @@ struct l_genl_msg *nl80211_build_new_rx_key_pairwise(uint32_t ifindex,return msg; } +struct l_genl_msg *nl80211_build_rekey_offload (uint32_t ifindex, +const uint8_t *kek, +const uint8_t *kck, +uint64_t replay_ctr) +{ +struct l_genl_msg *msg; + + msg =l_genl_msg_new_sized (NL80211_CMD_SET_REKEY_OFFLOAD ,512 ); + +l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &ifindex); + +l_genl_msg_enter_nested (msg,NL80211_ATTR_REKEY_DATA ); +l_genl_msg_append_attr (msg,NL80211_REKEY_DATA_KEK , +NL80211_KEK_LEN , kek); +l_genl_msg_append_attr (msg,NL80211_REKEY_DATA_KCK , +NL80211_KCK_LEN , kck); +l_genl_msg_append_attr (msg,NL80211_REKEY_DATA_REPLAY_CTR , +NL80211_REPLAY_CTR_LEN , &replay_ctr); + +l_genl_msg_leave_nested (msg); + +return msg; +} +static struct l_genl_msg *nl80211_build_set_station (uint32_t ifindex,const uint8_t *addr,struct nl80211_sta_flag_update *flags)
src/nl80211util.h +5 -0
@@ -57,6 +57,11 @@ struct l_genl_msg *nl80211_build_new_rx_key_pairwise(uint32_t ifindex,size_t tk_len, uint8_t key_id); +struct l_genl_msg *nl80211_build_rekey_offload (uint32_t ifindex, +const uint8_t *kek, +const uint8_t *kck, +uint64_t replay_ctr); +struct l_genl_msg *nl80211_build_set_station_authorized (uint32_t ifindex,const uint8_t *addr);
Signature · 1 line
2.42.0
PATCH 11/11 netdev: disambiguate between disconnection types
In reply to Denis KenziorThere 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.
--- src/netdev.c | 126 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 50 deletions(-)
src/netdev.c +76 -50
@@ -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;
@@ -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); } +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_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_sme_cb, + netdev,NULL ); +} +static void netdev_free (void *data) {struct netdev *netdev = data;
@@ -1388,11 +1445,9 @@ static void netdev_setting_keys_failed(struct netdev_handshake_state *nhs,return ; } - msg =nl80211_build_disconnect (netdev->index, -MMPDU_REASON_CODE_UNSPECIFIED ); - netdev->disconnect_cmd_id =l_genl_family_send (nl80211, msg, - netdev_disconnect_cb, - netdev,NULL ); +netdev_disconnect_by_sme (netdev, +NETDEV_RESULT_KEY_SETTING_FAILED , +MMPDU_REASON_CODE_UNSPECIFIED );break ;case NL80211_IFTYPE_AP :if (err == -ENETDOWN )
@@ -1407,7 +1462,6 @@ static void netdev_setting_keys_failed(struct netdev_handshake_state *nhs,break ; } - netdev->result =NETDEV_RESULT_KEY_SETTING_FAILED ;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->result =NETDEV_RESULT_HANDSHAKE_FAILED ; - netdev->last_code = reason_code; -switch (netdev->type) {case NL80211_IFTYPE_STATION :case NL80211_IFTYPE_P2P_CLIENT : - msg =nl80211_build_disconnect (netdev->index, reason_code); - netdev->disconnect_cmd_id =l_genl_family_send (nl80211, msg, - netdev_disconnect_cb, - netdev,NULL ); +netdev_disconnect_by_sme (netdev,NETDEV_RESULT_HANDSHAKE_FAILED , + reason_code);break ;case NL80211_IFTYPE_AP :case NL80211_IFTYPE_P2P_GO :
@@ -2842,14 +2891,9 @@ error:return ; deauth: - netdev->result =NETDEV_RESULT_ASSOCIATION_FAILED ; - netdev->last_code =MMPDU_STATUS_CODE_UNSPECIFIED ; - msg =nl80211_build_disconnect (netdev->index, -MMPDU_REASON_CODE_UNSPECIFIED ); - netdev->disconnect_cmd_id =l_genl_family_send (nl80211, - msg, - netdev_disconnect_cb, - netdev,NULL ); +netdev_disconnect_and_fail_connection (netdev, +NETDEV_RESULT_ASSOCIATION_FAILED , +MMPDU_STATUS_CODE_UNSPECIFIED ); } 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 ; -if (l_genl_msg_get_error (msg) <0 ) { -struct l_genl_msg *cmd_deauth; +if (l_genl_msg_get_error (msg) >=0 ) +return ; - netdev->result =NETDEV_RESULT_ASSOCIATION_FAILED ; - 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 ); - } +netdev_deauth_and_fail_connection (netdev, +NETDEV_RESULT_ASSOCIATION_FAILED , +MMPDU_STATUS_CODE_UNSPECIFIED ); } 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 */ if (retry) { -struct l_genl_msg *cmd_deauth; - - netdev->result =NETDEV_RESULT_ASSOCIATION_FAILED ; - 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 ); +netdev_deauth_and_fail_connection (netdev, +NETDEV_RESULT_ASSOCIATION_FAILED , +MMPDU_STATUS_CODE_UNSPECIFIED );return ; } }
@@ -4545,17 +4574,14 @@ static void netdev_sa_query_timeout(struct l_timeout *timeout, void *user_data) {struct netdev *netdev = user_data; -struct l_genl_msg *msg;l_info ("SA Query timed out, connection is invalid. Disconnecting..." );l_timeout_remove (netdev->sa_query_timeout); netdev->sa_query_timeout =NULL ; - msg =nl80211_build_disconnect (netdev->index, -MMPDU_REASON_CODE_PREV_AUTH_NOT_VALID ); - netdev->disconnect_cmd_id =l_genl_family_send (nl80211, msg, - netdev_disconnect_cb, netdev,NULL ); +netdev_disconnect_by_sme (netdev,NETDEV_RESULT_ABORTED , +MMPDU_REASON_CODE_PREV_AUTH_NOT_VALID ); }static void netdev_sa_query_req_cb (struct l_genl_msg *msg,void *user_data)
Signature · 1 line
2.42.0
Re: [PATCH 11/11] netdev: disambiguate between disconnection types
Hi Denis,
Quoted 13 lines · Denis Kenzior
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).
Quoted 4 lines
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.
I'm guessing the future changes would be to handle a CMD_DISCONNECT event via the connect callback?
Thanks,
James
Re: [PATCH 11/11] netdev: disambiguate between disconnection types
Hi James,
Quoted 16 lines · James Prestwood
Hi Denis,
Quoted 13 lines · Denis Kenzior
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).
Quoted 6 lines
Quoted 4 lines
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.I'm guessing the future changes would be to handle a
CMD_DISCONNECTevent via the connect callback?
Possibly. Have not made up my mind completely yet, but we do it both ways right now and we need to stick to one. Wanted to get the easy stuff out of the way first. Any comments or should I push this out?
Regards,
-Denis
Re: [PATCH 11/11] netdev: disambiguate between disconnection types
Quoted 19 lines · Denis Kenzior
Hi James,
Quoted 16 lines · James Prestwood
Hi Denis,
Quoted 13 lines · Denis Kenzior
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).
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
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.I'm guessing the future changes would be to handle a
CMD_DISCONNECTevent via the connect callback?Possibly. Have not made up my mind completely yet, but we do it both ways right now and we need to stick to one. Wanted to get the easy stuff out of the way first. Any comments or should I push this out?
Nope, it looks good to me.
Quoted 4 lines
Regards,
-Denis
Re: [PATCH 11/11] netdev: disambiguate between disconnection types
In reply to Denis KenziorHi Denis,
Quoted 13 lines · Denis Kenzior
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).
Quoted 4 lines
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.
Sorry for not following up on the issue I raised the other week. I am catching up with the mailing list now and see this patch. Am I right to assume this is some preperatory work for solving the issue I identified?
I acknowledge your previous remark that the issue ought to be solved in netdev.c and not in station.c.
Kind regards,
Alvin
Re: [PATCH 11/11] netdev: disambiguate between disconnection types
Hi Alvin,
Quoted 8 lines
Quoted 4 lines
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.Sorry for not following up on the issue I raised the other week. I am catching up with the mailing list now and see this patch. Am I right to assume this is some preperatory work for solving the issue I identified?
Yep. I got side-tracked by some oFono work, so don't have a fix for your particular problem yet.
Regards,
-Denis
Re: [PATCH 11/11] netdev: disambiguate between disconnection types
Hi Denis,
Quoted 7 lines · Denis Kenzior
Hi Alvin,
Quoted 5 lines
Quoted 4 lines
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.
Quoted 6 lines
Quoted 3 lines
Sorry for not following up on the issue I raised the other week. I am catching up with the mailing list now and see this patch. Am I right to assume this is some preperatory work for solving the issue I identified?
Yep. I got side-tracked by some oFono work, so don't have a fix for your particular problem yet.
Great, thanks a lot for following up on this. Sorry that I did not send out a more robust patch, but I have not had time these days.
Please add me on CC if you work further on this and we can do some additional internal testing to see if it works.
Kind regards,
Alvin
Quoted 10 lines · Denis Kenzior
The reason code from deauthentication frame was being obtained as a
uint8_tinstead of auint16_t. The value was only ever used in an informational statement. Since the value was in little endian, only the first 8 bits of the reason code were obtained. Fix that.Fixes 2bebb4bdc7ee ("netdev: Handle deauth frames prior to association")--- src/netdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
All applied.
Regards,
-Denis