samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Remove structure wmi_tdls_params

Browse Source 
Using both structure wmi_tdls_params and tdls_info if TDLS component
sets FW states, which will cause memory corruption potentially. Use
enum wmi_tdls_state as type of tdls state.

Change-Id: Ia1e78a5c6d8aee9ab5166c0704dd7827f42c2457
CRs-Fixed: 2372452
This commit is contained in:
Wu Gao
2018-12-25 17:44:05 +08:00
committed by nshrivas
parent 2ceaf3729a
commit 779d274148
5 changed files with 34 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wmi/inc/wmi_unified_param.h
View File

@@ -2637,43 +2637,6 @@ struct fw_dump_req_param {
struct fw_dump_seg_req_param segment[WMI_MAX_NUM_FW_SEGMENTS]; struct fw_dump_seg_req_param segment[WMI_MAX_NUM_FW_SEGMENTS];
}; };
/**
* struct wmi_tdls_params - TDLS parameters
* @vdev_id: vdev id
* @tdls_state: TDLS state
* @notification_interval_ms: notification inerval
* @tx_discovery_threshold: tx discovery threshold
* @tx_teardown_threshold: tx teardown threashold
* @rssi_teardown_threshold: RSSI teardown threshold
* @rssi_delta: RSSI delta
* @tdls_options: TDLS options
* @peer_traffic_ind_window: raffic indication window
* @peer_traffic_response_timeout: traffic response timeout
* @puapsd_mask: uapsd mask
* @puapsd_inactivity_time: uapsd inactivity time
* @puapsd_rx_frame_threshold: uapsd rx frame threshold
* @teardown_notification_ms: tdls teardown notification interval
* @tdls_peer_kickout_threshold: tdls packet threshold for
* peer kickout operation
*/
struct wmi_tdls_params {
uint32_t vdev_id;
uint32_t tdls_state;
uint32_t notification_interval_ms;
uint32_t tx_discovery_threshold;
uint32_t tx_teardown_threshold;
int32_t rssi_teardown_threshold;
int32_t rssi_delta;
uint32_t tdls_options;
uint32_t peer_traffic_ind_window;
uint32_t peer_traffic_response_timeout;
uint32_t puapsd_mask;
uint32_t puapsd_inactivity_time;
uint32_t puapsd_rx_frame_threshold;
uint32_t teardown_notification_ms;
uint32_t tdls_peer_kickout_threshold;
};
/** /**
* struct dhcp_offload_info_params - dhcp offload parameters * struct dhcp_offload_info_params - dhcp offload parameters
* @vdev_id: request data length * @vdev_id: request data length

3
wmi/inc/wmi_unified_priv.h
View File

@@ -935,7 +935,8 @@ QDF_STATUS (*send_set_tdls_offchan_mode_cmd)(wmi_unified_t wmi_handle,
struct tdls_channel_switch_params *chan_switch_params); struct tdls_channel_switch_params *chan_switch_params);
QDF_STATUS (*send_update_fw_tdls_state_cmd)(wmi_unified_t wmi_handle, QDF_STATUS (*send_update_fw_tdls_state_cmd)(wmi_unified_t wmi_handle,
void *tdls_param, uint8_t tdls_state); struct tdls_info *tdls_param,
enum wmi_tdls_state tdls_state);
QDF_STATUS (*send_update_tdls_peer_state_cmd)(wmi_unified_t wmi_handle, QDF_STATUS (*send_update_tdls_peer_state_cmd)(wmi_unified_t wmi_handle,
struct tdls_peer_state_params *peerStateParams, struct tdls_peer_state_params *peerStateParams,

7
wmi/inc/wmi_unified_sta_api.h
View File

@@ -185,13 +185,14 @@ QDF_STATUS wmi_unified_set_tdls_offchan_mode_cmd(void *wmi_hdl,
/** /**
* wmi_unified_update_fw_tdls_state_cmd() - send enable/disable tdls for a vdev * wmi_unified_update_fw_tdls_state_cmd() - send enable/disable tdls for a vdev
* @wmi_handle: wmi handle * @wmi_handle: wmi handle
* @pwmaTdlsparams: TDLS params * @tdls_param: TDLS params
* @tdls_state: TDLS state
* *
* Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
*/ */
QDF_STATUS wmi_unified_update_fw_tdls_state_cmd(void *wmi_hdl, QDF_STATUS wmi_unified_update_fw_tdls_state_cmd(void *wmi_hdl,
void *tdls_param, struct tdls_info *tdls_param,
uint8_t tdls_state); enum wmi_tdls_state tdls_state);
/** /**
* wmi_unified_update_tdls_peer_state_cmd() - update TDLS peer state * wmi_unified_update_tdls_peer_state_cmd() - update TDLS peer state

7
wmi/src/wmi_unified_sta_api.c
View File

@@ -161,13 +161,14 @@ QDF_STATUS wmi_unified_set_tdls_offchan_mode_cmd(void *wmi_hdl,
} }
QDF_STATUS wmi_unified_update_fw_tdls_state_cmd(void *wmi_hdl, QDF_STATUS wmi_unified_update_fw_tdls_state_cmd(void *wmi_hdl,
void *tdls_param, uint8_t tdls_state) struct tdls_info *tdls_param,
enum wmi_tdls_state tdls_state)
{ {
wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
if (wmi_handle->ops->send_update_fw_tdls_state_cmd) if (wmi_handle->ops->send_update_fw_tdls_state_cmd)
return wmi_handle->ops->send_update_fw_tdls_state_cmd(wmi_handle, return wmi_handle->ops->send_update_fw_tdls_state_cmd(
tdls_param, tdls_state); wmi_handle, tdls_param, tdls_state);
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }

43
wmi/src/wmi_unified_sta_tlv.c
View File

@@ -22,6 +22,9 @@
#include "wmi_unified_priv.h" #include "wmi_unified_priv.h"
#include "wmi_unified_sta_param.h" #include "wmi_unified_sta_param.h"
#include "wmi_unified_sta_api.h" #include "wmi_unified_sta_api.h"
#ifdef CONVERGED_TDLS_ENABLE
#include <wlan_tdls_public_structs.h>
#endif
/** /**
* send_set_sta_sa_query_param_cmd_tlv() - set sta sa query parameters * send_set_sta_sa_query_param_cmd_tlv() - set sta sa query parameters
@@ -635,13 +638,14 @@ static QDF_STATUS send_set_tdls_offchan_mode_cmd_tlv(wmi_unified_t wmi_handle,
* *
* Return: 0 for success or error code * Return: 0 for success or error code
*/ */
static QDF_STATUS send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle, static QDF_STATUS
void *tdls_param, uint8_t tdls_state) send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle,
struct tdls_info *tdls_param,
enum wmi_tdls_state tdls_state)
{ {
wmi_tdls_set_state_cmd_fixed_param *cmd; wmi_tdls_set_state_cmd_fixed_param *cmd;
wmi_buf_t wmi_buf; wmi_buf_t wmi_buf;
struct wmi_tdls_params *wmi_tdls = (struct wmi_tdls_params *) tdls_param;
uint16_t len = sizeof(wmi_tdls_set_state_cmd_fixed_param); uint16_t len = sizeof(wmi_tdls_set_state_cmd_fixed_param);
wmi_buf = wmi_buf_alloc(wmi_handle, len); wmi_buf = wmi_buf_alloc(wmi_handle, len);
@@ -653,25 +657,26 @@ static QDF_STATUS send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle,
WMITLV_TAG_STRUC_wmi_tdls_set_state_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_tdls_set_state_cmd_fixed_param,
WMITLV_GET_STRUCT_TLVLEN WMITLV_GET_STRUCT_TLVLEN
(wmi_tdls_set_state_cmd_fixed_param)); (wmi_tdls_set_state_cmd_fixed_param));
cmd->vdev_id = wmi_tdls->vdev_id; cmd->vdev_id = tdls_param->vdev_id;
cmd->state = tdls_state; cmd->state = (A_UINT32)tdls_state;
cmd->notification_interval_ms = wmi_tdls->notification_interval_ms; cmd->notification_interval_ms = tdls_param->notification_interval_ms;
cmd->tx_discovery_threshold = wmi_tdls->tx_discovery_threshold; cmd->tx_discovery_threshold = tdls_param->tx_discovery_threshold;
cmd->tx_teardown_threshold = wmi_tdls->tx_teardown_threshold; cmd->tx_teardown_threshold = tdls_param->tx_teardown_threshold;
cmd->rssi_teardown_threshold = wmi_tdls->rssi_teardown_threshold; cmd->rssi_teardown_threshold = tdls_param->rssi_teardown_threshold;
cmd->rssi_delta = wmi_tdls->rssi_delta; cmd->rssi_delta = tdls_param->rssi_delta;
cmd->tdls_options = wmi_tdls->tdls_options; cmd->tdls_options = tdls_param->tdls_options;
cmd->tdls_peer_traffic_ind_window = wmi_tdls->peer_traffic_ind_window; cmd->tdls_peer_traffic_ind_window = tdls_param->peer_traffic_ind_window;
cmd->tdls_peer_traffic_response_timeout_ms = cmd->tdls_peer_traffic_response_timeout_ms =
wmi_tdls->peer_traffic_response_timeout; tdls_param->peer_traffic_response_timeout;
cmd->tdls_puapsd_mask = wmi_tdls->puapsd_mask; cmd->tdls_puapsd_mask = tdls_param->puapsd_mask;
cmd->tdls_puapsd_inactivity_time_ms = wmi_tdls->puapsd_inactivity_time; cmd->tdls_puapsd_inactivity_time_ms =
tdls_param->puapsd_inactivity_time;
cmd->tdls_puapsd_rx_frame_threshold = cmd->tdls_puapsd_rx_frame_threshold =
wmi_tdls->puapsd_rx_frame_threshold; tdls_param->puapsd_rx_frame_threshold;
cmd->teardown_notification_ms = cmd->teardown_notification_ms =
wmi_tdls->teardown_notification_ms; tdls_param->teardown_notification_ms;
cmd->tdls_peer_kickout_threshold = cmd->tdls_peer_kickout_threshold =
wmi_tdls->tdls_peer_kickout_threshold; tdls_param->tdls_peer_kickout_threshold;
WMI_LOGD("%s: tdls_state: %d, state: %d, " WMI_LOGD("%s: tdls_state: %d, state: %d, "
"notification_interval_ms: %d, " "notification_interval_ms: %d, "
@@ -709,7 +714,7 @@ static QDF_STATUS send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle,
wmi_buf_free(wmi_buf); wmi_buf_free(wmi_buf);
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
WMI_LOGD("%s: vdev_id %d", __func__, wmi_tdls->vdev_id); WMI_LOGD("%s: vdev_id %d", __func__, tdls_param->vdev_id);
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }