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

Commit 28923390 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Fix command length check."

parents 7307c6ac 18e2d233

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+7 −4
Original line number Diff line number Diff line
@@ -900,19 +900,22 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev, 
	}

	case GET_MAX_CLK_RATE: {

		int rc = 0;

		unsigned long rate;



		if (cmd_len < sizeof(unsigned long)) {

		if (cmd_len != sizeof(__u32)) {

			pr_err("%s:%d failed: invalid cmd len %u exp %zu\n",

				__func__, __LINE__, cmd_len,

				sizeof(unsigned long));

				sizeof(__u32));

			return -EINVAL;

		}

		rc = msm_isp_get_max_clk_rate(vfe_dev,

			(unsigned long *)cfg_data);

		rc = msm_isp_get_max_clk_rate(vfe_dev, &rate);

		if (rc < 0) {

			pr_err("%s:%d failed: rc %d\n", __func__, __LINE__, rc);

			return -EINVAL;

		}



		*(__u32 *)cfg_data = (__u32)rate;



		break;

	}

	case GET_ISP_ID: {