Merge "msm: camera: ope: check cpu buffer offset and cmd buf idx" into camera-kernel.lnx.7.0
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
47d88e467c
@@ -2212,6 +2212,14 @@ static int cam_ope_mgr_process_cmd_buf_req(struct cam_ope_hw_mgr *hw_mgr,
|
|||||||
hw_mgr->iommu_hdl);
|
hw_mgr->iommu_hdl);
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
if ((len <= frame_process->cmd_buf[i][j].offset) ||
|
||||||
|
(frame_process->cmd_buf[i][j].size <
|
||||||
|
frame_process->cmd_buf[i][j].length) ||
|
||||||
|
((len - frame_process->cmd_buf[i][j].offset) <
|
||||||
|
frame_process->cmd_buf[i][j].length)) {
|
||||||
|
CAM_ERR(CAM_OPE, "Invalid offset.");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
cpu_addr = cpu_addr +
|
cpu_addr = cpu_addr +
|
||||||
frame_process->cmd_buf[i][j].offset;
|
frame_process->cmd_buf[i][j].offset;
|
||||||
CAM_DBG(CAM_OPE, "Hdl %x size %d len %d off %d",
|
CAM_DBG(CAM_OPE, "Hdl %x size %d len %d off %d",
|
||||||
@@ -2260,6 +2268,10 @@ static int cam_ope_mgr_process_cmd_buf_req(struct cam_ope_hw_mgr *hw_mgr,
|
|||||||
uint32_t s_idx = 0;
|
uint32_t s_idx = 0;
|
||||||
|
|
||||||
s_idx = cmd_buf->stripe_idx;
|
s_idx = cmd_buf->stripe_idx;
|
||||||
|
if (s_idx < 0 || s_idx >= OPE_MAX_STRIPES) {
|
||||||
|
CAM_ERR(CAM_OPE, "Invalid index.");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
num_cmd_bufs =
|
num_cmd_bufs =
|
||||||
ope_request->num_stripe_cmd_bufs[i][s_idx];
|
ope_request->num_stripe_cmd_bufs[i][s_idx];
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user