A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 06:03:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Fix function type for sme_ser_cmd_callback

Browse source 
To address kernel control flow integrity (CFI) issues related to type
mismatch, correct the input argument type for sme_ser_cmd_callback().

Change-Id: I3f0b5df70163eca9282d2b1c2a48203448e4f0a6
CRs-Fixed: 2402977
This commit is contained in:
Rajeev Kumar Sirasanagandla 2019-01-29 14:05:44 -08:00 • committed by nshrivas
commit 4477e7e4ae
5 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/nan/core/src/nan_main.c
View file

@ -204,11 +204,10 @@ static void nan_req_activated(void *in_req, uint32_t cmdtype)
tx_ops->nan_datapath_req_tx(in_req, req_type);
}
static QDF_STATUS nan_serialized_cb(void *cmd,
static QDF_STATUS nan_serialized_cb(struct wlan_serialization_command *ser_cmd,
enum wlan_serialization_cb_reason reason)
{
void *req;
struct wlan_serialization_command *ser_cmd = cmd;
if (!ser_cmd || !ser_cmd->umac_cmd) {
nan_alert("cmd or umac_cmd is null");

9
components/tdls/core/src/wlan_tdls_cmds_process.c
View file

@ -823,8 +823,7 @@ QDF_STATUS tdls_process_add_peer(struct tdls_add_peer_request *req)
vdev = req->vdev;
cmd.cmd_type = WLAN_SER_CMD_TDLS_ADD_PEER;
cmd.cmd_id = 0;
cmd.cmd_cb = (wlan_serialization_cmd_callback)
tdls_add_peer_serialize_callback;
cmd.cmd_cb = tdls_add_peer_serialize_callback;
cmd.umac_cmd = req;
cmd.source = WLAN_UMAC_COMP_TDLS;
cmd.is_high_priority = false;
@ -1039,8 +1038,7 @@ QDF_STATUS tdls_process_update_peer(struct tdls_update_peer_request *req)
vdev = req->vdev;
cmd.cmd_type = WLAN_SER_CMD_TDLS_ADD_PEER;
cmd.cmd_id = 0;
cmd.cmd_cb = (wlan_serialization_cmd_callback)
tdls_update_peer_serialize_callback;
cmd.cmd_cb = tdls_update_peer_serialize_callback;
cmd.umac_cmd = req;
cmd.source = WLAN_UMAC_COMP_TDLS;
cmd.is_high_priority = false;
@ -1193,8 +1191,7 @@ QDF_STATUS tdls_process_del_peer(struct tdls_oper_request *req)
cmd.cmd_type = WLAN_SER_CMD_TDLS_DEL_PEER;
cmd.cmd_id = 0;
cmd.cmd_cb = (wlan_serialization_cmd_callback)
tdls_del_peer_serialize_callback;
cmd.cmd_cb = tdls_del_peer_serialize_callback;
cmd.umac_cmd = req;
cmd.source = WLAN_UMAC_COMP_TDLS;
cmd.is_high_priority = false;

3
components/tdls/core/src/wlan_tdls_mgmt.c
View file

@ -404,8 +404,7 @@ QDF_STATUS tdls_process_mgmt_req(
cmd.cmd_type = WLAN_SER_CMD_TDLS_SEND_MGMT;
/* Cmd Id not applicable for non scan cmds */
cmd.cmd_id = 0;
cmd.cmd_cb = (wlan_serialization_cmd_callback)
tdls_send_mgmt_serialize_callback;
cmd.cmd_cb = tdls_send_mgmt_serialize_callback;
cmd.umac_cmd = tdls_mgmt_req;
cmd.source = WLAN_UMAC_COMP_TDLS;
cmd.is_high_priority = false;

4
core/sme/inc/sme_api.h
View file

@ -447,7 +447,7 @@ QDF_STATUS sme_set11dinfo(mac_handle_t mac_handle,
QDF_STATUS sme_hdd_ready_ind(mac_handle_t mac_handle);
/**
* sme_ser_cmd_callback() - callback from serialization module
* @buf: serialization command buffer
* @cmd: serialization command
* @reason: reason why serialization module has given this callback
*
* Serialization module will give callback to SME for why it triggered
@ -455,7 +455,7 @@ QDF_STATUS sme_hdd_ready_ind(mac_handle_t mac_handle);
*
* Return: QDF_STATUS_SUCCESS
*/
QDF_STATUS sme_ser_cmd_callback(void *buf,
QDF_STATUS sme_ser_cmd_callback(struct wlan_serialization_command *cmd,
enum wlan_serialization_cb_reason reason);
/**

3
core/sme/src/common/sme_api.c
View file

@ -538,10 +538,9 @@ QDF_STATUS sme_ser_handle_active_cmd(struct wlan_serialization_command *cmd)
return status;
}
QDF_STATUS sme_ser_cmd_callback(void *buf,
QDF_STATUS sme_ser_cmd_callback(struct wlan_serialization_command *cmd,
enum wlan_serialization_cb_reason reason)
{
struct wlan_serialization_command *cmd = buf;
mac_handle_t mac_handle;
struct mac_context *mac_ctx;
QDF_STATUS status = QDF_STATUS_SUCCESS;