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

Commit abcce7e3 authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: icp: Prevent out of bound access in acquire" into dev/msm-4.14-camx

parents 4fff2720 5fcc58b1

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+7 −0
Original line number Diff line number Diff line
@@ -4690,6 +4690,13 @@ static int cam_icp_get_acquire_info(struct cam_icp_hw_mgr *hw_mgr, 
		return -EFAULT;

	}



	/* To make sure num_out_res is same as allocated */

	if (ctx_data->icp_dev_acquire_info->num_out_res !=

		icp_dev_acquire_info.num_out_res) {

		CAM_ERR(CAM_ICP, "num_out_res got changed");

		return -EFAULT;

	}



	CAM_DBG(CAM_ICP, "%x %x %x %x %x %x %x",

		ctx_data->icp_dev_acquire_info->dev_type,

		ctx_data->icp_dev_acquire_info->in_res.format,