Explorar el Código

qcacld-3.0: Fix function type for pe_handle_mgmt_frame

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

Change-Id: I2617c55655ba0303b89580e58f1bc2ea2efcefb9
CRs-Fixed: 2402966
Rajeev Kumar Sirasanagandla hace 6 años
padre
commit
b61b4f97ca
Se han modificado 1 ficheros con 3 adiciones y 5 borrados
  1. 3 5
      core/mac/src/pe/lim/lim_api.c

+ 3 - 5
core/mac/src/pe/lim/lim_api.c

@@ -1174,7 +1174,7 @@ static QDF_STATUS pe_handle_probe_req_frames(struct mac_context *mac_ctx,
 static QDF_STATUS pe_handle_mgmt_frame(struct wlan_objmgr_psoc *psoc,
 			struct wlan_objmgr_peer *peer, qdf_nbuf_t buf,
 			struct mgmt_rx_event_params *mgmt_rx_params,
-			uint32_t frm_type)
+			enum mgmt_frame_type frm_type)
 {
 	struct mac_context *mac;
 	tpSirMacMgmtHdr mHdr;
@@ -1275,8 +1275,7 @@ void pe_register_mgmt_rx_frm_callback(struct mac_context *mac_ctx)
 	struct mgmt_txrx_mgmt_frame_cb_info frm_cb_info;
 
 	frm_cb_info.frm_type = MGMT_FRAME_TYPE_ALL;
-	frm_cb_info.mgmt_rx_cb = (mgmt_frame_rx_callback)
-				pe_handle_mgmt_frame;
+	frm_cb_info.mgmt_rx_cb = pe_handle_mgmt_frame;
 
 	status = wlan_mgmt_txrx_register_rx_cb(mac_ctx->psoc,
 					 WLAN_UMAC_COMP_MLME, &frm_cb_info, 1);
@@ -1292,8 +1291,7 @@ void pe_deregister_mgmt_rx_frm_callback(struct mac_context *mac_ctx)
 	struct mgmt_txrx_mgmt_frame_cb_info frm_cb_info;
 
 	frm_cb_info.frm_type = MGMT_FRAME_TYPE_ALL;
-	frm_cb_info.mgmt_rx_cb = (mgmt_frame_rx_callback)
-				pe_handle_mgmt_frame;
+	frm_cb_info.mgmt_rx_cb = pe_handle_mgmt_frame;
 
 	status = wlan_mgmt_txrx_deregister_rx_cb(mac_ctx->psoc,
 					 WLAN_UMAC_COMP_MLME, &frm_cb_info, 1);