From 206a79a7fac08a08c89e871b5887a5851676e209 Mon Sep 17 00:00:00 2001 From: Terence Ho Date: Wed, 14 Jun 2017 15:49:25 -0400 Subject: [PATCH] msm: camera: Add error check for cmd in IOCTL. Return EINVAL if cmd is not v4l2 PRIVATE_IOCTL_CMD. CRs-Fixed: 2016416 Change-Id: I6758bc9d6b159b2e2e4eba5a9d9a3882de320041 Signed-off-by: Terence Ho --- drivers/media/platform/msm/ais/camera/camera.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/msm/ais/camera/camera.c b/drivers/media/platform/msm/ais/camera/camera.c index 158b83c12d00..b937bee6687d 100644 --- a/drivers/media/platform/msm/ais/camera/camera.c +++ b/drivers/media/platform/msm/ais/camera/camera.c @@ -491,6 +491,9 @@ static long camera_v4l2_vidioc_private_ioctl(struct file *filep, void *fh, if (WARN_ON(!k_ioctl || !pvdev)) return -EIO; + if (cmd != VIDIOC_MSM_CAMERA_PRIVATE_IOCTL_CMD) + return -EINVAL; + switch (k_ioctl->id) { case MSM_CAMERA_PRIV_IOCTL_ID_RETURN_BUF: { struct msm_camera_return_buf ptr, *tmp = NULL;