summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2011-01-16 15:03:28 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-19 14:46:14 +0100
commitc959acfddb3d24ecfdae1a280a7a1785d9df81d1 (patch)
treeb8ead8b3c9e3720c0bbcabaa06f68c85805c219e
parent[media] pvrusb2: Provide more information about IR units to lirc_zilog and ir... (diff)
downloadlinux-c959acfddb3d24ecfdae1a280a7a1785d9df81d1.tar.xz
linux-c959acfddb3d24ecfdae1a280a7a1785d9df81d1.zip
[media] v4l2-ctrls: fix missing 'read-only' check
VIDIOC_S_CTRL did not check against read-only controls. Even worse, for controls of type CTRL_CLASS it would cause a kernel oops since those controls do not have a s_ctrl op. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/v4l2-ctrls.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index 0d1a3d831374..22a9a722f520 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -1824,6 +1824,9 @@ static int set_ctrl(struct v4l2_ctrl *ctrl, s32 *val)
int ret;
int i;
+ if (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
+ return -EACCES;
+
v4l2_ctrl_lock(ctrl);
/* Reset the 'is_new' flags of the cluster */