mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
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 45dbb6c0cd
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 <monicam@motorola.com>
Reviewed-by: Gilberto Gambugge Neto <gambugge@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
parent
86a6f14b08
commit
f311d7c3d9
1 changed files with 8 additions and 6 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue