diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-27 07:04:23 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 18:45:23 -0400 |
commit | cd634f1bfc182e564f33809fdca33027bb99fceb (patch) | |
tree | e81c3b626866a64b8152576cb500ee2fc2fe40a0 /include/media | |
parent | dfc2e12df02d49a1567bc90989ceef870cf5b147 (diff) |
[media] v4l2: put VIDIOC_DBG_G_CHIP_NAME under ADV_DEBUG
Only enable this ioctl if the VIDEO_ADV_DEBUG config option is set. This
prevents abuse from both userspace and kernelspace (some bridge drivers
abuse DBG_G_CHIP_IDENT, lets prevent that from happening again with this
ioctl).
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/v4l2-ioctl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index b273f0e81818..6b917d69e408 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h | |||
@@ -243,12 +243,12 @@ struct v4l2_ioctl_ops { | |||
243 | struct v4l2_dbg_register *reg); | 243 | struct v4l2_dbg_register *reg); |
244 | int (*vidioc_s_register) (struct file *file, void *fh, | 244 | int (*vidioc_s_register) (struct file *file, void *fh, |
245 | const struct v4l2_dbg_register *reg); | 245 | const struct v4l2_dbg_register *reg); |
246 | #endif | ||
247 | int (*vidioc_g_chip_ident) (struct file *file, void *fh, | ||
248 | struct v4l2_dbg_chip_ident *chip); | ||
249 | 246 | ||
250 | int (*vidioc_g_chip_name) (struct file *file, void *fh, | 247 | int (*vidioc_g_chip_name) (struct file *file, void *fh, |
251 | struct v4l2_dbg_chip_name *chip); | 248 | struct v4l2_dbg_chip_name *chip); |
249 | #endif | ||
250 | int (*vidioc_g_chip_ident) (struct file *file, void *fh, | ||
251 | struct v4l2_dbg_chip_ident *chip); | ||
252 | 252 | ||
253 | int (*vidioc_enum_framesizes) (struct file *file, void *fh, | 253 | int (*vidioc_enum_framesizes) (struct file *file, void *fh, |
254 | struct v4l2_frmsizeenum *fsize); | 254 | struct v4l2_frmsizeenum *fsize); |