Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63045555 authored by Soundrapandian Jeyaprakash's avatar Soundrapandian Jeyaprakash
Browse files

msm: camera: sanitize the camera sensor driver 



Check for upper bounds are added in the sensor driver and
initialized the flash driver with default value.

Change-Id: I96781d0a59404edcb0bf44609682f0344efa788d
Signed-off-by: default avatarSoundrapandian Jeyaprakash <jsoundra@codeaurora.org>
parent f531607d

drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl, 
		break;

	}

	case CAM_QUERY_CAP: {

		struct cam_flash_query_cap_info flash_cap;

		struct cam_flash_query_cap_info flash_cap = {0};



		CAM_DBG(CAM_FLASH, "CAM_QUERY_CAP");

		flash_cap.slot_info = fctrl->soc_info.index;

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c

+8 −3
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ int32_t msm_camera_fill_vreg_params( 


	num_vreg = soc_info->num_rgltr;



	if (num_vreg <= 0) {

	if ((num_vreg <= 0) || (num_vreg >= CAM_SOC_MAX_REGULATOR)) {

		CAM_ERR(CAM_SENSOR, "failed: num_vreg %d", num_vreg);

		return -EINVAL;

	}
@@ -1132,8 +1132,8 @@ int cam_sensor_core_power_up(struct cam_sensor_power_ctrl_t *ctrl, 
	gpio_num_info = ctrl->gpio_num_info;

	num_vreg = soc_info->num_rgltr;



	if ((num_vreg == 0) || (num_vreg > CAM_SOC_MAX_REGULATOR)) {

		CAM_ERR(CAM_SENSOR, "Regulators are not initialized");

	if ((num_vreg <= 0) || (num_vreg >= CAM_SOC_MAX_REGULATOR)) {

		CAM_ERR(CAM_SENSOR, "failed: num_vreg %d", num_vreg);

		return -EINVAL;

	}
@@ -1481,6 +1481,11 @@ int msm_camera_power_down(struct cam_sensor_power_ctrl_t *ctrl, 
	gpio_num_info = ctrl->gpio_num_info;

	num_vreg = soc_info->num_rgltr;



	if ((num_vreg <= 0) || (num_vreg >= CAM_SOC_MAX_REGULATOR)) {

		CAM_ERR(CAM_SENSOR, "failed: num_vreg %d", num_vreg);

		return -EINVAL;

	}



	for (index = 0; index < ctrl->power_down_setting_size; index++) {

		CAM_DBG(CAM_SENSOR, "index %d",  index);

		pd = &ctrl->power_down_setting[index];