From 486c859ad6c81a30168831252fb7ebd6917549c6 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Fri, 30 Apr 2021 10:47:04 -0700 Subject: [PATCH] ft: netdev: add return value to tx_associate Prior to this, an error sending the FT Reassociation was treated as fatal, which is correct for FT-over-Air but not for FT-over-DS. If the actual l_genl_family_send call fails for FT-over-DS the existing connection can be maintained and there is no need to call netdev_connect_failed. Adding a return to the tx_associate function works for both FT types. In the FT-over-Air case this return will ultimately get sent back up to auth_proto_rx_authenticate in which case will call netdev_connect_failed. For FT-over-DS tx_associate is actually called from the 'start' operation which can fail and still maintain the existing connection. --- src/ft.c | 4 +--- src/ft.h | 2 +- src/netdev.c | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ft.c b/src/ft.c index 76285d13..de754fd8 100644 --- a/src/ft.c +++ b/src/ft.c @@ -287,9 +287,7 @@ static int ft_tx_reassociate(struct ft_sm *ft) iov_elems += 1; } - ft->tx_assoc(iov, iov_elems, ft->user_data); - - return 0; + return ft->tx_assoc(iov, iov_elems, ft->user_data); error: return -EINVAL; diff --git a/src/ft.h b/src/ft.h index 7c009f16..3d1cfe30 100644 --- a/src/ft.h +++ b/src/ft.h @@ -24,7 +24,7 @@ struct handshake_state; typedef void (*ft_tx_authenticate_func_t)(struct iovec *iov, size_t iov_len, void *user_data); -typedef void (*ft_tx_associate_func_t)(struct iovec *ie_iov, size_t iov_len, +typedef int (*ft_tx_associate_func_t)(struct iovec *ie_iov, size_t iov_len, void *user_data); typedef void (*ft_ds_free_func_t)(void *user_data); diff --git a/src/netdev.c b/src/netdev.c index a34effca..7a3f15e3 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -3651,7 +3651,7 @@ restore_snonce: MMPDU_STATUS_CODE_UNSPECIFIED); } -static void netdev_ft_tx_associate(struct iovec *ie_iov, size_t iov_len, +static int netdev_ft_tx_associate(struct iovec *ie_iov, size_t iov_len, void *user_data) { struct netdev *netdev = user_data; @@ -3669,9 +3669,7 @@ static void netdev_ft_tx_associate(struct iovec *ie_iov, size_t iov_len, if (!netdev->connect_cmd_id) { l_genl_msg_unref(msg); - netdev_connect_failed(netdev, NETDEV_RESULT_ASSOCIATION_FAILED, - MMPDU_STATUS_CODE_UNSPECIFIED); - return; + return -EIO; } /* No need to keep this around at this point */ @@ -3679,6 +3677,8 @@ static void netdev_ft_tx_associate(struct iovec *ie_iov, size_t iov_len, ft_ds_info_free(&netdev->ft_ds_info->super); netdev->ft_ds_info = NULL; } + + return 0; } static void prepare_ft(struct netdev *netdev, struct scan_bss *target_bss)