summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrishansh Bhardwaj <tbhardwa@codeaurora.org>2017-03-18 12:00:46 +0530
committerTrishansh Bhardwaj <tbhardwa@codeaurora.org>2017-03-18 13:17:41 +0530
commit707c12c3758373699ff73eb96ba8dd49df8d4e73 (patch)
tree6fcff4708204bd18c7aa8b228cec49c2ebec06a6
parent3f942f9f968e02b8dbaa9a76f1d095aebe7b3b15 (diff)
msm: camera: Add error check for cmd in IOCTL.
Return EINVAL if cmd is not v4l2 PRIVATE_IOCTL_CMD. Change-Id: Iaffa0f2062ea9832dfbaf58a5477185721ff0046 Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
-rw-r--r--drivers/media/platform/msm/camera_v2/camera/camera.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/camera_v2/camera/camera.c b/drivers/media/platform/msm/camera_v2/camera/camera.c
index 3985df780216..df0664b496ba 100644
--- a/drivers/media/platform/msm/camera_v2/camera/camera.c
+++ b/drivers/media/platform/msm/camera_v2/camera/camera.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -486,6 +486,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;