From f311d7c3d9009e608aec6463d0db83c14597e110 Mon Sep 17 00:00:00 2001 From: Bruno Melo Date: Thu, 6 Jan 2022 10:44:15 -0400 Subject: [PATCH] Revert "msm: camera: ife: Add ife num outport bound checks" Reverting QC patch temporarily to unblock Berlin/BerlinNA camera while we investigate its applicability. This reverts commit 45dbb6c0cde224cb333d62a9111c264367d27df2 Change-Id: I7ec6edc857787e48ebe4e5fb1405ad13604dfb36 Reviewed-on: https://gerrit.mot.com/2163860 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Monica Mabuchi Reviewed-by: Gilberto Gambugge Neto Submit-Approved: Jira Key --- .../isp_hw_mgr/hw_utils/cam_isp_packet_parser.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/cam_isp/isp_hw_mgr/hw_utils/cam_isp_packet_parser.c b/drivers/cam_isp/isp_hw_mgr/hw_utils/cam_isp_packet_parser.c index 7357cfd9f77b..bf059c109e43 100644 --- a/drivers/cam_isp/isp_hw_mgr/hw_utils/cam_isp_packet_parser.c +++ b/drivers/cam_isp/isp_hw_mgr/hw_utils/cam_isp_packet_parser.c @@ -124,12 +124,6 @@ static int cam_isp_update_dual_config( cpu_addr += (cmd_desc->offset / 4); dual_config = (struct cam_isp_dual_config *)cpu_addr; - if (dual_config->num_ports > size_isp_out) { - CAM_ERR(CAM_ISP, "num_ports %d more than max_vfe_out_res %d", - dual_config->num_ports, size_isp_out); - return -EINVAL; - } - if ((dual_config->num_ports * sizeof(struct cam_isp_dual_stripe_config)) > (remain_len - offsetof(struct cam_isp_dual_config, stripes))) { @@ -138,6 +132,14 @@ static int cam_isp_update_dual_config( } for (i = 0; i < dual_config->num_ports; i++) { + if (i >= CAM_ISP_IFE_OUT_RES_BASE + size_isp_out) { + CAM_ERR(CAM_ISP, + "failed update for i:%d > size_isp_out:%d", + i, size_isp_out); + rc = -EINVAL; + goto end; + } + hw_mgr_res = &res_list_isp_out[i]; if (!hw_mgr_res) { CAM_ERR(CAM_ISP,