Merge "msm: camera: cpp: Add validation for v4l2 ioctl arguments" (7428c498) · Commits · e / devices / android_kernel_xiaomi_markw

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -2809,14 +2809,14 @@ static int msm_cpp_validate_input(unsigned int cmd, void *arg,
		break;
		default: {
		if (ioctl_ptr == NULL) {
		pr_err("Wrong ioctl_ptr %pK\n", ioctl_ptr);
		pr_err("Wrong ioctl_ptr for cmd %u\n", cmd);
		return -EINVAL;
		}

		*ioctl_ptr = arg;
		if ((*ioctl_ptr == NULL) \|\|
		((*ioctl_ptr)->ioctl_ptr == NULL)) {
		pr_err("Wrong arg %pK\n", arg);
		(*ioctl_ptr)->ioctl_ptr == NULL) {
		pr_err("Error invalid ioctl argument cmd %u", cmd);
		return -EINVAL;
		}
		break;
		@@ -2841,6 +2841,12 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd,
		pr_err("cpp_dev is null\n");
		return -EINVAL;
		}

		if (_IOC_DIR(cmd) == _IOC_NONE) {
		pr_err("Invalid ioctl/subdev cmd %u", cmd);
		return -EINVAL;
		}

		rc = msm_cpp_validate_input(cmd, arg, &ioctl_ptr);
		if (rc != 0) {
		pr_err("input validation failed\n");