From 0d76e160eb8f03cc197eea9c2bc1ad17cfa02730 Mon Sep 17 00:00:00 2001 From: Shravya Samala Date: Wed, 9 Dec 2020 16:47:20 +0530 Subject: [PATCH] msm: camera: isp: Fix type mismatch arguments in indirect function calls To avoid CFI failures, fix type mismatch arguments in callback functions. CRs-Fixed: 2836088 Change-Id: Ib1d79ca3f4489081c909aeb9ead2e66ef20aed64 Signed-off-by: Shravya Samala --- drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c | 3 ++- drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c index b6e9cb1e4127..941d1c46b280 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c @@ -7583,7 +7583,8 @@ static int cam_ife_hw_mgr_find_affected_ctx( */ if (notify_err_cb) notify_err_cb(ife_hwr_mgr_ctx->common.cb_priv, - CAM_ISP_HW_EVENT_ERROR, error_event_data); + CAM_ISP_HW_EVENT_ERROR, + (void *)error_event_data); else { CAM_WARN(CAM_ISP, "Error call back is not set"); goto end; diff --git a/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c index 13e093257b16..3aa2040baaa7 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c @@ -5170,7 +5170,7 @@ static int cam_tfe_hw_mgr_find_affected_ctx( */ if (notify_err_cb) { notify_err_cb(tfe_hwr_mgr_ctx->common.cb_priv, - CAM_ISP_HW_EVENT_ERROR, error_event_data); + CAM_ISP_HW_EVENT_ERROR, (void *)error_event_data); } else { CAM_WARN(CAM_ISP, "Error call back is not set"); goto end; @@ -5304,7 +5304,7 @@ static int cam_tfe_hw_mgr_handle_hw_rup( if (atomic_read(&tfe_hw_mgr_ctx->overflow_pending)) break; tfe_hwr_irq_rup_cb(tfe_hw_mgr_ctx->common.cb_priv, - CAM_ISP_HW_EVENT_REG_UPDATE, &rup_event_data); + CAM_ISP_HW_EVENT_REG_UPDATE, (void *)&rup_event_data); break; default: @@ -5336,7 +5336,8 @@ static int cam_tfe_hw_mgr_handle_hw_epoch( if (atomic_read(&tfe_hw_mgr_ctx->overflow_pending)) break; tfe_hw_irq_epoch_cb(tfe_hw_mgr_ctx->common.cb_priv, - CAM_ISP_HW_EVENT_EPOCH, &epoch_done_event_data); + CAM_ISP_HW_EVENT_EPOCH, + (void *)&epoch_done_event_data); break; case CAM_ISP_HW_TFE_IN_RDI0: @@ -5377,7 +5378,7 @@ static int cam_tfe_hw_mgr_handle_hw_sof( break; tfe_hw_irq_sof_cb(tfe_hw_mgr_ctx->common.cb_priv, - CAM_ISP_HW_EVENT_SOF, &sof_done_event_data); + CAM_ISP_HW_EVENT_SOF, (void *)&sof_done_event_data); break; @@ -5392,7 +5393,7 @@ static int cam_tfe_hw_mgr_handle_hw_sof( if (atomic_read(&tfe_hw_mgr_ctx->overflow_pending)) break; tfe_hw_irq_sof_cb(tfe_hw_mgr_ctx->common.cb_priv, - CAM_ISP_HW_EVENT_SOF, &sof_done_event_data); + CAM_ISP_HW_EVENT_SOF, (void *)&sof_done_event_data); break; default: @@ -5423,7 +5424,7 @@ static int cam_tfe_hw_mgr_handle_hw_eof( if (atomic_read(&tfe_hw_mgr_ctx->overflow_pending)) break; tfe_hw_irq_eof_cb(tfe_hw_mgr_ctx->common.cb_priv, - CAM_ISP_HW_EVENT_EOF, &eof_done_event_data); + CAM_ISP_HW_EVENT_EOF, (void *)&eof_done_event_data); break; @@ -5466,7 +5467,7 @@ static int cam_tfe_hw_mgr_handle_hw_buf_done( if (buf_done_event_data.num_handles > 0 && tfe_hwr_irq_wm_done_cb) { CAM_DBG(CAM_ISP, "Notify ISP context"); tfe_hwr_irq_wm_done_cb(tfe_hw_mgr_ctx->common.cb_priv, - CAM_ISP_HW_EVENT_DONE, &buf_done_event_data); + CAM_ISP_HW_EVENT_DONE, (void *)&buf_done_event_data); } CAM_DBG(CAM_ISP, "Buf done for out_res->res_id: 0x%x",