evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: sensor: actuator: avoid accessing out of bound memory"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-09 01:36:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit a2e26ea434
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
View file

@ -96,6 +96,11 @@ static void msm_actuator_parse_i2c_params(struct msm_actuator_ctrl_t *a_ctrl,
return; return;
} }
if (a_ctrl->i2c_reg_tbl == NULL) {
pr_err("failed. i2c reg tabl is NULL");
return;
}
size = a_ctrl->reg_tbl_size; size = a_ctrl->reg_tbl_size;
write_arr = a_ctrl->reg_tbl; write_arr = a_ctrl->reg_tbl;
i2c_tbl = a_ctrl->i2c_reg_tbl; i2c_tbl = a_ctrl->i2c_reg_tbl;
@ -1286,9 +1291,11 @@ static int32_t msm_actuator_set_param(struct msm_actuator_ctrl_t *a_ctrl,
if (copy_from_user(&a_ctrl->region_params, if (copy_from_user(&a_ctrl->region_params,
(void *)set_info->af_tuning_params.region_params, (void *)set_info->af_tuning_params.region_params,
a_ctrl->region_size * sizeof(struct region_params_t))) a_ctrl->region_size * sizeof(struct region_params_t))) {
a_ctrl->total_steps = 0;
pr_err("Error copying region_params\n");
return -EFAULT; return -EFAULT;
}
if (a_ctrl->act_device_type == MSM_CAMERA_PLATFORM_DEVICE) { if (a_ctrl->act_device_type == MSM_CAMERA_PLATFORM_DEVICE) {
cci_client = a_ctrl->i2c_client.cci_client; cci_client = a_ctrl->i2c_client.cci_client;
cci_client->sid = cci_client->sid =