summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-22 07:40:20 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-22 07:40:20 -0700
commitb944e8d1e62adf39641051fcd7d407c2c8186e81 (patch)
treed5dcb68ae502c993b09103836c884884255e8575
parent7c14b62c88b2c1acfa7b5ba01217fb4feb727297 (diff)
parent206a79a7fac08a08c89e871b5887a5851676e209 (diff)
Merge "msm: camera: Add error check for cmd in IOCTL."
-rw-r--r--drivers/media/platform/msm/ais/camera/camera.c3
1 files changed, 3 insertions, 0 deletions
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;