[media] v4l2-dev: disable selection ioctls for non-video devices
The selection/cropping ioctls are only valid for video nodes, not for vbi. Found by v4l2-compliance when run on a VBI device node. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
8a55ddd94c
commit
2c9fc463d6
|
@ -611,6 +611,14 @@ static void determine_valid_ioctls(struct video_device *vdev)
|
||||||
SET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd);
|
SET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd);
|
||||||
SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMESIZES, vidioc_enum_framesizes);
|
SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMESIZES, vidioc_enum_framesizes);
|
||||||
SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMEINTERVALS, vidioc_enum_frameintervals);
|
SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMEINTERVALS, vidioc_enum_frameintervals);
|
||||||
|
if (ops->vidioc_g_crop || ops->vidioc_g_selection)
|
||||||
|
set_bit(_IOC_NR(VIDIOC_G_CROP), valid_ioctls);
|
||||||
|
if (ops->vidioc_s_crop || ops->vidioc_s_selection)
|
||||||
|
set_bit(_IOC_NR(VIDIOC_S_CROP), valid_ioctls);
|
||||||
|
SET_VALID_IOCTL(ops, VIDIOC_G_SELECTION, vidioc_g_selection);
|
||||||
|
SET_VALID_IOCTL(ops, VIDIOC_S_SELECTION, vidioc_s_selection);
|
||||||
|
if (ops->vidioc_cropcap || ops->vidioc_g_selection)
|
||||||
|
set_bit(_IOC_NR(VIDIOC_CROPCAP), valid_ioctls);
|
||||||
} else if (is_vbi) {
|
} else if (is_vbi) {
|
||||||
/* vbi specific ioctls */
|
/* vbi specific ioctls */
|
||||||
if ((is_rx && (ops->vidioc_g_fmt_vbi_cap ||
|
if ((is_rx && (ops->vidioc_g_fmt_vbi_cap ||
|
||||||
|
@ -679,14 +687,6 @@ static void determine_valid_ioctls(struct video_device *vdev)
|
||||||
SET_VALID_IOCTL(ops, VIDIOC_G_AUDOUT, vidioc_g_audout);
|
SET_VALID_IOCTL(ops, VIDIOC_G_AUDOUT, vidioc_g_audout);
|
||||||
SET_VALID_IOCTL(ops, VIDIOC_S_AUDOUT, vidioc_s_audout);
|
SET_VALID_IOCTL(ops, VIDIOC_S_AUDOUT, vidioc_s_audout);
|
||||||
}
|
}
|
||||||
if (ops->vidioc_g_crop || ops->vidioc_g_selection)
|
|
||||||
set_bit(_IOC_NR(VIDIOC_G_CROP), valid_ioctls);
|
|
||||||
if (ops->vidioc_s_crop || ops->vidioc_s_selection)
|
|
||||||
set_bit(_IOC_NR(VIDIOC_S_CROP), valid_ioctls);
|
|
||||||
SET_VALID_IOCTL(ops, VIDIOC_G_SELECTION, vidioc_g_selection);
|
|
||||||
SET_VALID_IOCTL(ops, VIDIOC_S_SELECTION, vidioc_s_selection);
|
|
||||||
if (ops->vidioc_cropcap || ops->vidioc_g_selection)
|
|
||||||
set_bit(_IOC_NR(VIDIOC_CROPCAP), valid_ioctls);
|
|
||||||
if (ops->vidioc_g_parm || (vdev->vfl_type == VFL_TYPE_GRABBER &&
|
if (ops->vidioc_g_parm || (vdev->vfl_type == VFL_TYPE_GRABBER &&
|
||||||
ops->vidioc_g_std))
|
ops->vidioc_g_std))
|
||||||
set_bit(_IOC_NR(VIDIOC_G_PARM), valid_ioctls);
|
set_bit(_IOC_NR(VIDIOC_G_PARM), valid_ioctls);
|
||||||
|
|
Loading…
Reference in New Issue