tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab 2c9fc463 8a55ddd9

+8 -8
+8 -8
drivers/media/v4l2-core/v4l2-dev.c
··· 611 611 SET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd); 612 612 SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMESIZES, vidioc_enum_framesizes); 613 613 SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMEINTERVALS, vidioc_enum_frameintervals); 614 + if (ops->vidioc_g_crop || ops->vidioc_g_selection) 615 + set_bit(_IOC_NR(VIDIOC_G_CROP), valid_ioctls); 616 + if (ops->vidioc_s_crop || ops->vidioc_s_selection) 617 + set_bit(_IOC_NR(VIDIOC_S_CROP), valid_ioctls); 618 + SET_VALID_IOCTL(ops, VIDIOC_G_SELECTION, vidioc_g_selection); 619 + SET_VALID_IOCTL(ops, VIDIOC_S_SELECTION, vidioc_s_selection); 620 + if (ops->vidioc_cropcap || ops->vidioc_g_selection) 621 + set_bit(_IOC_NR(VIDIOC_CROPCAP), valid_ioctls); 614 622 } else if (is_vbi) { 615 623 /* vbi specific ioctls */ 616 624 if ((is_rx && (ops->vidioc_g_fmt_vbi_cap || ··· 687 679 SET_VALID_IOCTL(ops, VIDIOC_G_AUDOUT, vidioc_g_audout); 688 680 SET_VALID_IOCTL(ops, VIDIOC_S_AUDOUT, vidioc_s_audout); 689 681 } 690 - if (ops->vidioc_g_crop || ops->vidioc_g_selection) 691 - set_bit(_IOC_NR(VIDIOC_G_CROP), valid_ioctls); 692 - if (ops->vidioc_s_crop || ops->vidioc_s_selection) 693 - set_bit(_IOC_NR(VIDIOC_S_CROP), valid_ioctls); 694 - SET_VALID_IOCTL(ops, VIDIOC_G_SELECTION, vidioc_g_selection); 695 - SET_VALID_IOCTL(ops, VIDIOC_S_SELECTION, vidioc_s_selection); 696 - if (ops->vidioc_cropcap || ops->vidioc_g_selection) 697 - set_bit(_IOC_NR(VIDIOC_CROPCAP), valid_ioctls); 698 682 if (ops->vidioc_g_parm || (vdev->vfl_type == VFL_TYPE_GRABBER && 699 683 ops->vidioc_g_std)) 700 684 set_bit(_IOC_NR(VIDIOC_G_PARM), valid_ioctls);