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

msm: camera: isp: Fix the callback arguments in IFE

Browse source 
Fix the callback arguments in IFE to avoid the CFI
check failure. A few callbacks invokes do not typecast for
the last argument of the event callback. Since callbacks
are indirect function call, CFI check for this will fail.

CRs-Fixed: 2807933
Change-Id: I4e72cf07de701bbfd8f7d7829207256918beeb4c
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
This commit is contained in:
Jigar Agrawal 2020-10-29 17:04:43 -07:00
commit d3650f098c
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
View file

@ -7718,7 +7718,7 @@ static int cam_ife_hw_mgr_handle_hw_rup(
if (atomic_read(&ife_hw_mgr_ctx->overflow_pending))
break;
ife_hwr_irq_rup_cb(ife_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;
case CAM_ISP_HW_VFE_IN_RDI0:
@ -7730,7 +7730,7 @@ static int cam_ife_hw_mgr_handle_hw_rup(
if (atomic_read(&ife_hw_mgr_ctx->overflow_pending))
break;
ife_hwr_irq_rup_cb(ife_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;
case CAM_ISP_HW_VFE_IN_PDLIB:
@ -7768,7 +7768,7 @@ static int cam_ife_hw_mgr_handle_hw_epoch(
epoch_done_event_data.frame_id_meta = event_info->reg_val;
ife_hw_irq_epoch_cb(ife_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;
@ -7836,7 +7836,7 @@ static int cam_ife_hw_mgr_handle_hw_sof(
break;
ife_hw_irq_sof_cb(ife_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;
@ -7852,7 +7852,7 @@ static int cam_ife_hw_mgr_handle_hw_sof(
if (atomic_read(&ife_hw_mgr_ctx->overflow_pending))
break;
ife_hw_irq_sof_cb(ife_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;
case CAM_ISP_HW_VFE_IN_PDLIB:
@ -7889,7 +7889,7 @@ static int cam_ife_hw_mgr_handle_hw_eof(
break;
ife_hw_irq_eof_cb(ife_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;
@ -7936,7 +7936,7 @@ static int cam_ife_hw_mgr_handle_hw_buf_done(
if (buf_done_event_data.num_handles > 0 && ife_hwr_irq_wm_done_cb) {
CAM_DBG(CAM_ISP, "Notify ISP context");
ife_hwr_irq_wm_done_cb(ife_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,