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

Commit a4638c41 authored by Ravi kumar Koyyana's avatar Ravi kumar Koyyana Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera2: cpp: Fix iommu_attach/detach compat_ioctl issue 



When the Camera application exercises the  V4L2  ioctl operations, CPP
driver would attempt to the copy  user space buffer  contents into the
internal kernel buffer.  If an invalid length of the user space buffer
is passed onto the driver, it could trigger buffer overflow condition.

Thus, fix this by copying user space buffer contents into kernel space
buffer of the  driver for further processing, only after checking for
proper length of user space buffer.

CRs-fixed: 2025367
Change-Id: I85cf4a961884c7bb0d036299b886044aef7baf7c
Signed-off-by: default avatarRavi kumar Koyyana <rkoyyana@codeaurora.org>
parent 822fa236

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+12 −7
Original line number Diff line number Diff line
@@ -2855,13 +2855,15 @@ end: 
	return rc;

}



static int msm_cpp_validate_input(unsigned int cmd, void *arg,

static int msm_cpp_validate_ioctl_input(unsigned int cmd, void *arg,

	struct msm_camera_v4l2_ioctl_t **ioctl_ptr)

{

	switch (cmd) {

	case MSM_SD_SHUTDOWN:

	case MSM_SD_NOTIFY_FREEZE:

	case MSM_SD_UNNOTIFY_FREEZE:

	case VIDIOC_MSM_CPP_IOMMU_ATTACH:

	case VIDIOC_MSM_CPP_IOMMU_DETACH:

		break;

	default: {

		if (ioctl_ptr == NULL) {
@@ -2870,8 +2872,9 @@ static int msm_cpp_validate_input(unsigned int cmd, void *arg, 
		}



		*ioctl_ptr = arg;

		if ((*ioctl_ptr == NULL) ||

			(*ioctl_ptr)->ioctl_ptr == NULL) {

		if (((*ioctl_ptr) == NULL) ||

			((*ioctl_ptr)->ioctl_ptr == NULL) ||

			((*ioctl_ptr)->len == 0)) {

			pr_err("Error invalid ioctl argument cmd %u", cmd);

			return -EINVAL;

		}
@@ -2903,7 +2906,7 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd, 
		return -EINVAL;

	}



	rc = msm_cpp_validate_input(cmd, arg, &ioctl_ptr);

	rc = msm_cpp_validate_ioctl_input(cmd, arg, &ioctl_ptr);

	if (rc != 0) {

		pr_err("input validation failed\n");

		return rc;
@@ -3396,7 +3399,7 @@ STREAM_BUFF_END: 
			(cpp_dev->stream_cnt == 0)) {

			rc = cam_smmu_ops(cpp_dev->iommu_hdl, CAM_SMMU_DETACH);

			if (rc < 0) {

				pr_err("%s:%dError iommu atach failed\n",

				pr_err("%s:%dError iommu detach failed\n",

					__func__, __LINE__);

				rc = -EINVAL;

				break;
@@ -3405,6 +3408,7 @@ STREAM_BUFF_END: 
		} else {

			pr_err("%s:%d IOMMMU attach triggered in invalid state\n",

				__func__, __LINE__);

			rc = -EINVAL;

		}

		break;

	}
@@ -4037,7 +4041,8 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file, 
	default:

		pr_err_ratelimited("%s: unsupported compat type :%x LOAD %lu\n",

				__func__, cmd, VIDIOC_MSM_CPP_LOAD_FIRMWARE);

		break;

		mutex_unlock(&cpp_dev->mutex);

		return -EINVAL;

	}



	mutex_unlock(&cpp_dev->mutex);
@@ -4068,7 +4073,7 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file, 
	default:

		pr_err_ratelimited("%s: unsupported compat type :%d\n",

				__func__, cmd);

		break;

		return -EINVAL;

	}



	if (is_copytouser_req) {