| Message ID | 20191014084021.54191-2-hverkuil-cisco@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | v4l2-core: improve ioctl validation | expand |
Hi Hans, Tank you for the patch. On Mon, Oct 14, 2019 at 10:40:19AM +0200, Hans Verkuil wrote: > From: Vandana BN <bnvandana@gmail.com> > > If the type is VFL_TYPE_GRABBER, then also check device_caps > to see if the video device supports video and/or metadata and > disable unneeded ioctls. > > Without this change, format ioctls for both video and metadata devices > could be called on both device nodes. This is true for other ioctls as > well, even if the device supports only video or metadata. > > Metadata devices act similar to VBI devices w.r.t. which ioctls should > be enabled. This makes sense since VBI *is* metadata. > > Signed-off-by: Vandana BN <bnvandana@gmail.com> > Co-Developed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > --- > drivers/media/v4l2-core/v4l2-dev.c | 62 +++++++++++++++++----------- > drivers/media/v4l2-core/v4l2-ioctl.c | 16 +++++-- > 2 files changed, 52 insertions(+), 26 deletions(-) > > diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c > index 4037689a945a..1bf543932e4f 100644 > --- a/drivers/media/v4l2-core/v4l2-dev.c > +++ b/drivers/media/v4l2-core/v4l2-dev.c > @@ -533,13 +533,23 @@ static int get_index(struct video_device *vdev) > */ > static void determine_valid_ioctls(struct video_device *vdev) > { > + const u32 vid_caps = V4L2_CAP_VIDEO_CAPTURE | > + V4L2_CAP_VIDEO_CAPTURE_MPLANE | > + V4L2_CAP_VIDEO_OUTPUT | > + V4L2_CAP_VIDEO_OUTPUT_MPLANE | > + V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE; > + const u32 meta_caps = V4L2_CAP_META_CAPTURE | > + V4L2_CAP_META_OUTPUT; > DECLARE_BITMAP(valid_ioctls, BASE_VIDIOC_PRIVATE); > const struct v4l2_ioctl_ops *ops = vdev->ioctl_ops; > - bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER; > + bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER && > + (vdev->device_caps & vid_caps); > bool is_vbi = vdev->vfl_type == VFL_TYPE_VBI; > bool is_radio = vdev->vfl_type == VFL_TYPE_RADIO; > bool is_sdr = vdev->vfl_type == VFL_TYPE_SDR; > bool is_tch = vdev->vfl_type == VFL_TYPE_TOUCH; > + bool is_meta = vdev->vfl_type == VFL_TYPE_GRABBER && > + (vdev->device_caps & meta_caps); > bool is_rx = vdev->vfl_dir != VFL_DIR_TX; > bool is_tx = vdev->vfl_dir != VFL_DIR_RX; > > @@ -587,39 +597,31 @@ static void determine_valid_ioctls(struct video_device *vdev) > set_bit(_IOC_NR(VIDIOC_ENUM_FREQ_BANDS), valid_ioctls); > > if (is_vid || is_tch) { > - /* video and metadata specific ioctls */ > + /* video and touch specific ioctls */ > if ((is_rx && (ops->vidioc_enum_fmt_vid_cap || > - ops->vidioc_enum_fmt_vid_overlay || > - ops->vidioc_enum_fmt_meta_cap)) || > - (is_tx && (ops->vidioc_enum_fmt_vid_out || > - ops->vidioc_enum_fmt_meta_out))) > + ops->vidioc_enum_fmt_vid_overlay)) || > + (is_tx && ops->vidioc_enum_fmt_vid_out)) > set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls); > if ((is_rx && (ops->vidioc_g_fmt_vid_cap || > ops->vidioc_g_fmt_vid_cap_mplane || > - ops->vidioc_g_fmt_vid_overlay || > - ops->vidioc_g_fmt_meta_cap)) || > + ops->vidioc_g_fmt_vid_overlay)) || > (is_tx && (ops->vidioc_g_fmt_vid_out || > ops->vidioc_g_fmt_vid_out_mplane || > - ops->vidioc_g_fmt_vid_out_overlay || > - ops->vidioc_g_fmt_meta_out))) > + ops->vidioc_g_fmt_vid_out_overlay))) > set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls); > if ((is_rx && (ops->vidioc_s_fmt_vid_cap || > ops->vidioc_s_fmt_vid_cap_mplane || > - ops->vidioc_s_fmt_vid_overlay || > - ops->vidioc_s_fmt_meta_cap)) || > + ops->vidioc_s_fmt_vid_overlay)) || > (is_tx && (ops->vidioc_s_fmt_vid_out || > ops->vidioc_s_fmt_vid_out_mplane || > - ops->vidioc_s_fmt_vid_out_overlay || > - ops->vidioc_s_fmt_meta_out))) > + ops->vidioc_s_fmt_vid_out_overlay))) > set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls); > if ((is_rx && (ops->vidioc_try_fmt_vid_cap || > ops->vidioc_try_fmt_vid_cap_mplane || > - ops->vidioc_try_fmt_vid_overlay || > - ops->vidioc_try_fmt_meta_cap)) || > + ops->vidioc_try_fmt_vid_overlay)) || > (is_tx && (ops->vidioc_try_fmt_vid_out || > ops->vidioc_try_fmt_vid_out_mplane || > - ops->vidioc_try_fmt_vid_out_overlay || > - ops->vidioc_try_fmt_meta_out))) > + ops->vidioc_try_fmt_vid_out_overlay))) > set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls); > SET_VALID_IOCTL(ops, VIDIOC_OVERLAY, vidioc_overlay); > SET_VALID_IOCTL(ops, VIDIOC_G_FBUF, vidioc_g_fbuf); > @@ -641,7 +643,21 @@ static void determine_valid_ioctls(struct video_device *vdev) > 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); > - } else if (is_vbi) { > + } Here you allow for is_vid and is_meta to be both true. > + if (is_meta && is_rx) { > + /* metadata capture specific ioctls */ > + SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_meta_cap); > + SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_meta_cap); > + SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_meta_cap); > + SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_meta_cap); > + } else if (is_meta && is_tx) { > + /* metadata output specific ioctls */ > + SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_meta_out); > + SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_meta_out); > + SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_meta_out); > + SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_meta_out); > + } And here for is_vbi to be true as well. But further down (not shown in this patch), is_sdr is still considered to be mutually exclusive with is_vbi. This is a bit confusing, even if I think it's correct. > + if (is_vbi) { > /* vbi specific ioctls */ > if ((is_rx && (ops->vidioc_g_fmt_vbi_cap || > ops->vidioc_g_fmt_sliced_vbi_cap)) || > @@ -681,8 +697,8 @@ static void determine_valid_ioctls(struct video_device *vdev) > set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls); > } > > - if (is_vid || is_vbi || is_sdr || is_tch) { > - /* ioctls valid for video, metadata, vbi or sdr */ > + if (is_vid || is_vbi || is_sdr || is_tch || is_meta) { > + /* ioctls valid for video, vbi, sdr, touch and metadata */ > SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs); > SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf); > SET_VALID_IOCTL(ops, VIDIOC_QBUF, vidioc_qbuf); > @@ -694,8 +710,8 @@ static void determine_valid_ioctls(struct video_device *vdev) > SET_VALID_IOCTL(ops, VIDIOC_STREAMOFF, vidioc_streamoff); > } > > - if (is_vid || is_vbi || is_tch) { > - /* ioctls valid for video or vbi */ > + if (is_vid || is_vbi || is_tch || is_meta) { > + /* ioctls valid for video, vbi, touch and metadata */ Are all those ioctls valid for metadata ? > if (ops->vidioc_s_std) > set_bit(_IOC_NR(VIDIOC_ENUMSTD), valid_ioctls); > SET_VALID_IOCTL(ops, VIDIOC_S_STD, vidioc_s_std); > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c > index 51b912743f0f..20b3107dd4e8 100644 > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > @@ -932,12 +932,22 @@ static int check_ext_ctrls(struct v4l2_ext_controls *c, int allow_priv) > > static int check_fmt(struct file *file, enum v4l2_buf_type type) > { > + const u32 vid_caps = V4L2_CAP_VIDEO_CAPTURE | > + V4L2_CAP_VIDEO_CAPTURE_MPLANE | > + V4L2_CAP_VIDEO_OUTPUT | > + V4L2_CAP_VIDEO_OUTPUT_MPLANE | > + V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE; > + const u32 meta_caps = V4L2_CAP_META_CAPTURE | > + V4L2_CAP_META_OUTPUT; > struct video_device *vfd = video_devdata(file); > const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops; > - bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER; > + bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER && > + (vfd->device_caps & vid_caps); > bool is_vbi = vfd->vfl_type == VFL_TYPE_VBI; > bool is_sdr = vfd->vfl_type == VFL_TYPE_SDR; > bool is_tch = vfd->vfl_type == VFL_TYPE_TOUCH; > + bool is_meta = vfd->vfl_type == VFL_TYPE_GRABBER && > + (vfd->device_caps & meta_caps); > bool is_rx = vfd->vfl_dir != VFL_DIR_TX; > bool is_tx = vfd->vfl_dir != VFL_DIR_RX; > > @@ -996,11 +1006,11 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type) > return 0; > break; > case V4L2_BUF_TYPE_META_CAPTURE: > - if (is_vid && is_rx && ops->vidioc_g_fmt_meta_cap) > + if (is_meta && is_rx && ops->vidioc_g_fmt_meta_cap) > return 0; > break; > case V4L2_BUF_TYPE_META_OUTPUT: > - if (is_vid && is_tx && ops->vidioc_g_fmt_meta_out) > + if (is_meta && is_tx && ops->vidioc_g_fmt_meta_out) > return 0; > break; > default:
On 10/14/19 11:36 PM, Laurent Pinchart wrote: > Hi Hans, > > Tank you for the patch. > > On Mon, Oct 14, 2019 at 10:40:19AM +0200, Hans Verkuil wrote: >> From: Vandana BN <bnvandana@gmail.com> >> >> If the type is VFL_TYPE_GRABBER, then also check device_caps >> to see if the video device supports video and/or metadata and >> disable unneeded ioctls. >> >> Without this change, format ioctls for both video and metadata devices >> could be called on both device nodes. This is true for other ioctls as >> well, even if the device supports only video or metadata. >> >> Metadata devices act similar to VBI devices w.r.t. which ioctls should >> be enabled. This makes sense since VBI *is* metadata. >> >> Signed-off-by: Vandana BN <bnvandana@gmail.com> >> Co-Developed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> >> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> >> --- >> drivers/media/v4l2-core/v4l2-dev.c | 62 +++++++++++++++++----------- >> drivers/media/v4l2-core/v4l2-ioctl.c | 16 +++++-- >> 2 files changed, 52 insertions(+), 26 deletions(-) >> >> diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c >> index 4037689a945a..1bf543932e4f 100644 >> --- a/drivers/media/v4l2-core/v4l2-dev.c >> +++ b/drivers/media/v4l2-core/v4l2-dev.c >> @@ -533,13 +533,23 @@ static int get_index(struct video_device *vdev) >> */ >> static void determine_valid_ioctls(struct video_device *vdev) >> { >> + const u32 vid_caps = V4L2_CAP_VIDEO_CAPTURE | >> + V4L2_CAP_VIDEO_CAPTURE_MPLANE | >> + V4L2_CAP_VIDEO_OUTPUT | >> + V4L2_CAP_VIDEO_OUTPUT_MPLANE | >> + V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE; >> + const u32 meta_caps = V4L2_CAP_META_CAPTURE | >> + V4L2_CAP_META_OUTPUT; >> DECLARE_BITMAP(valid_ioctls, BASE_VIDIOC_PRIVATE); >> const struct v4l2_ioctl_ops *ops = vdev->ioctl_ops; >> - bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER; >> + bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER && >> + (vdev->device_caps & vid_caps); >> bool is_vbi = vdev->vfl_type == VFL_TYPE_VBI; >> bool is_radio = vdev->vfl_type == VFL_TYPE_RADIO; >> bool is_sdr = vdev->vfl_type == VFL_TYPE_SDR; >> bool is_tch = vdev->vfl_type == VFL_TYPE_TOUCH; >> + bool is_meta = vdev->vfl_type == VFL_TYPE_GRABBER && >> + (vdev->device_caps & meta_caps); >> bool is_rx = vdev->vfl_dir != VFL_DIR_TX; >> bool is_tx = vdev->vfl_dir != VFL_DIR_RX; >> >> @@ -587,39 +597,31 @@ static void determine_valid_ioctls(struct video_device *vdev) >> set_bit(_IOC_NR(VIDIOC_ENUM_FREQ_BANDS), valid_ioctls); >> >> if (is_vid || is_tch) { >> - /* video and metadata specific ioctls */ >> + /* video and touch specific ioctls */ >> if ((is_rx && (ops->vidioc_enum_fmt_vid_cap || >> - ops->vidioc_enum_fmt_vid_overlay || >> - ops->vidioc_enum_fmt_meta_cap)) || >> - (is_tx && (ops->vidioc_enum_fmt_vid_out || >> - ops->vidioc_enum_fmt_meta_out))) >> + ops->vidioc_enum_fmt_vid_overlay)) || >> + (is_tx && ops->vidioc_enum_fmt_vid_out)) >> set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls); >> if ((is_rx && (ops->vidioc_g_fmt_vid_cap || >> ops->vidioc_g_fmt_vid_cap_mplane || >> - ops->vidioc_g_fmt_vid_overlay || >> - ops->vidioc_g_fmt_meta_cap)) || >> + ops->vidioc_g_fmt_vid_overlay)) || >> (is_tx && (ops->vidioc_g_fmt_vid_out || >> ops->vidioc_g_fmt_vid_out_mplane || >> - ops->vidioc_g_fmt_vid_out_overlay || >> - ops->vidioc_g_fmt_meta_out))) >> + ops->vidioc_g_fmt_vid_out_overlay))) >> set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls); >> if ((is_rx && (ops->vidioc_s_fmt_vid_cap || >> ops->vidioc_s_fmt_vid_cap_mplane || >> - ops->vidioc_s_fmt_vid_overlay || >> - ops->vidioc_s_fmt_meta_cap)) || >> + ops->vidioc_s_fmt_vid_overlay)) || >> (is_tx && (ops->vidioc_s_fmt_vid_out || >> ops->vidioc_s_fmt_vid_out_mplane || >> - ops->vidioc_s_fmt_vid_out_overlay || >> - ops->vidioc_s_fmt_meta_out))) >> + ops->vidioc_s_fmt_vid_out_overlay))) >> set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls); >> if ((is_rx && (ops->vidioc_try_fmt_vid_cap || >> ops->vidioc_try_fmt_vid_cap_mplane || >> - ops->vidioc_try_fmt_vid_overlay || >> - ops->vidioc_try_fmt_meta_cap)) || >> + ops->vidioc_try_fmt_vid_overlay)) || >> (is_tx && (ops->vidioc_try_fmt_vid_out || >> ops->vidioc_try_fmt_vid_out_mplane || >> - ops->vidioc_try_fmt_vid_out_overlay || >> - ops->vidioc_try_fmt_meta_out))) >> + ops->vidioc_try_fmt_vid_out_overlay))) >> set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls); >> SET_VALID_IOCTL(ops, VIDIOC_OVERLAY, vidioc_overlay); >> SET_VALID_IOCTL(ops, VIDIOC_G_FBUF, vidioc_g_fbuf); >> @@ -641,7 +643,21 @@ static void determine_valid_ioctls(struct video_device *vdev) >> 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); >> - } else if (is_vbi) { >> + } > > Here you allow for is_vid and is_meta to be both true. > >> + if (is_meta && is_rx) { >> + /* metadata capture specific ioctls */ >> + SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_meta_cap); >> + SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_meta_cap); >> + SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_meta_cap); >> + SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_meta_cap); >> + } else if (is_meta && is_tx) { >> + /* metadata output specific ioctls */ >> + SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_meta_out); >> + SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_meta_out); >> + SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_meta_out); >> + SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_meta_out); >> + } > > And here for is_vbi to be true as well. But further down (not shown in > this patch), is_sdr is still considered to be mutually exclusive with > is_vbi. This is a bit confusing, even if I think it's correct. After patch 3 it looks a bit better. The code is correct, so I don't want to change it. > >> + if (is_vbi) { >> /* vbi specific ioctls */ >> if ((is_rx && (ops->vidioc_g_fmt_vbi_cap || >> ops->vidioc_g_fmt_sliced_vbi_cap)) || >> @@ -681,8 +697,8 @@ static void determine_valid_ioctls(struct video_device *vdev) >> set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls); >> } >> >> - if (is_vid || is_vbi || is_sdr || is_tch) { >> - /* ioctls valid for video, metadata, vbi or sdr */ >> + if (is_vid || is_vbi || is_sdr || is_tch || is_meta) { >> + /* ioctls valid for video, vbi, sdr, touch and metadata */ >> SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs); >> SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf); >> SET_VALID_IOCTL(ops, VIDIOC_QBUF, vidioc_qbuf); >> @@ -694,8 +710,8 @@ static void determine_valid_ioctls(struct video_device *vdev) >> SET_VALID_IOCTL(ops, VIDIOC_STREAMOFF, vidioc_streamoff); >> } >> >> - if (is_vid || is_vbi || is_tch) { >> - /* ioctls valid for video or vbi */ >> + if (is_vid || is_vbi || is_tch || is_meta) { >> + /* ioctls valid for video, vbi, touch and metadata */ > > Are all those ioctls valid for metadata ? Yes, when metadata is used with SDTV/HDTV receivers, potentially with tuners. It should behave the same as a VBI device, which is also metadata. Regards, Hans > >> if (ops->vidioc_s_std) >> set_bit(_IOC_NR(VIDIOC_ENUMSTD), valid_ioctls); >> SET_VALID_IOCTL(ops, VIDIOC_S_STD, vidioc_s_std); >> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c >> index 51b912743f0f..20b3107dd4e8 100644 >> --- a/drivers/media/v4l2-core/v4l2-ioctl.c >> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c >> @@ -932,12 +932,22 @@ static int check_ext_ctrls(struct v4l2_ext_controls *c, int allow_priv) >> >> static int check_fmt(struct file *file, enum v4l2_buf_type type) >> { >> + const u32 vid_caps = V4L2_CAP_VIDEO_CAPTURE | >> + V4L2_CAP_VIDEO_CAPTURE_MPLANE | >> + V4L2_CAP_VIDEO_OUTPUT | >> + V4L2_CAP_VIDEO_OUTPUT_MPLANE | >> + V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE; >> + const u32 meta_caps = V4L2_CAP_META_CAPTURE | >> + V4L2_CAP_META_OUTPUT; >> struct video_device *vfd = video_devdata(file); >> const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops; >> - bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER; >> + bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER && >> + (vfd->device_caps & vid_caps); >> bool is_vbi = vfd->vfl_type == VFL_TYPE_VBI; >> bool is_sdr = vfd->vfl_type == VFL_TYPE_SDR; >> bool is_tch = vfd->vfl_type == VFL_TYPE_TOUCH; >> + bool is_meta = vfd->vfl_type == VFL_TYPE_GRABBER && >> + (vfd->device_caps & meta_caps); >> bool is_rx = vfd->vfl_dir != VFL_DIR_TX; >> bool is_tx = vfd->vfl_dir != VFL_DIR_RX; >> >> @@ -996,11 +1006,11 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type) >> return 0; >> break; >> case V4L2_BUF_TYPE_META_CAPTURE: >> - if (is_vid && is_rx && ops->vidioc_g_fmt_meta_cap) >> + if (is_meta && is_rx && ops->vidioc_g_fmt_meta_cap) >> return 0; >> break; >> case V4L2_BUF_TYPE_META_OUTPUT: >> - if (is_vid && is_tx && ops->vidioc_g_fmt_meta_out) >> + if (is_meta && is_tx && ops->vidioc_g_fmt_meta_out) >> return 0; >> break; >> default: >
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c index 4037689a945a..1bf543932e4f 100644 --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c @@ -533,13 +533,23 @@ static int get_index(struct video_device *vdev) */ static void determine_valid_ioctls(struct video_device *vdev) { + const u32 vid_caps = V4L2_CAP_VIDEO_CAPTURE | + V4L2_CAP_VIDEO_CAPTURE_MPLANE | + V4L2_CAP_VIDEO_OUTPUT | + V4L2_CAP_VIDEO_OUTPUT_MPLANE | + V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE; + const u32 meta_caps = V4L2_CAP_META_CAPTURE | + V4L2_CAP_META_OUTPUT; DECLARE_BITMAP(valid_ioctls, BASE_VIDIOC_PRIVATE); const struct v4l2_ioctl_ops *ops = vdev->ioctl_ops; - bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER; + bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER && + (vdev->device_caps & vid_caps); bool is_vbi = vdev->vfl_type == VFL_TYPE_VBI; bool is_radio = vdev->vfl_type == VFL_TYPE_RADIO; bool is_sdr = vdev->vfl_type == VFL_TYPE_SDR; bool is_tch = vdev->vfl_type == VFL_TYPE_TOUCH; + bool is_meta = vdev->vfl_type == VFL_TYPE_GRABBER && + (vdev->device_caps & meta_caps); bool is_rx = vdev->vfl_dir != VFL_DIR_TX; bool is_tx = vdev->vfl_dir != VFL_DIR_RX; @@ -587,39 +597,31 @@ static void determine_valid_ioctls(struct video_device *vdev) set_bit(_IOC_NR(VIDIOC_ENUM_FREQ_BANDS), valid_ioctls); if (is_vid || is_tch) { - /* video and metadata specific ioctls */ + /* video and touch specific ioctls */ if ((is_rx && (ops->vidioc_enum_fmt_vid_cap || - ops->vidioc_enum_fmt_vid_overlay || - ops->vidioc_enum_fmt_meta_cap)) || - (is_tx && (ops->vidioc_enum_fmt_vid_out || - ops->vidioc_enum_fmt_meta_out))) + ops->vidioc_enum_fmt_vid_overlay)) || + (is_tx && ops->vidioc_enum_fmt_vid_out)) set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls); if ((is_rx && (ops->vidioc_g_fmt_vid_cap || ops->vidioc_g_fmt_vid_cap_mplane || - ops->vidioc_g_fmt_vid_overlay || - ops->vidioc_g_fmt_meta_cap)) || + ops->vidioc_g_fmt_vid_overlay)) || (is_tx && (ops->vidioc_g_fmt_vid_out || ops->vidioc_g_fmt_vid_out_mplane || - ops->vidioc_g_fmt_vid_out_overlay || - ops->vidioc_g_fmt_meta_out))) + ops->vidioc_g_fmt_vid_out_overlay))) set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls); if ((is_rx && (ops->vidioc_s_fmt_vid_cap || ops->vidioc_s_fmt_vid_cap_mplane || - ops->vidioc_s_fmt_vid_overlay || - ops->vidioc_s_fmt_meta_cap)) || + ops->vidioc_s_fmt_vid_overlay)) || (is_tx && (ops->vidioc_s_fmt_vid_out || ops->vidioc_s_fmt_vid_out_mplane || - ops->vidioc_s_fmt_vid_out_overlay || - ops->vidioc_s_fmt_meta_out))) + ops->vidioc_s_fmt_vid_out_overlay))) set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls); if ((is_rx && (ops->vidioc_try_fmt_vid_cap || ops->vidioc_try_fmt_vid_cap_mplane || - ops->vidioc_try_fmt_vid_overlay || - ops->vidioc_try_fmt_meta_cap)) || + ops->vidioc_try_fmt_vid_overlay)) || (is_tx && (ops->vidioc_try_fmt_vid_out || ops->vidioc_try_fmt_vid_out_mplane || - ops->vidioc_try_fmt_vid_out_overlay || - ops->vidioc_try_fmt_meta_out))) + ops->vidioc_try_fmt_vid_out_overlay))) set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls); SET_VALID_IOCTL(ops, VIDIOC_OVERLAY, vidioc_overlay); SET_VALID_IOCTL(ops, VIDIOC_G_FBUF, vidioc_g_fbuf); @@ -641,7 +643,21 @@ static void determine_valid_ioctls(struct video_device *vdev) 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); - } else if (is_vbi) { + } + if (is_meta && is_rx) { + /* metadata capture specific ioctls */ + SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_meta_cap); + SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_meta_cap); + SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_meta_cap); + SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_meta_cap); + } else if (is_meta && is_tx) { + /* metadata output specific ioctls */ + SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_meta_out); + SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_meta_out); + SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_meta_out); + SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_meta_out); + } + if (is_vbi) { /* vbi specific ioctls */ if ((is_rx && (ops->vidioc_g_fmt_vbi_cap || ops->vidioc_g_fmt_sliced_vbi_cap)) || @@ -681,8 +697,8 @@ static void determine_valid_ioctls(struct video_device *vdev) set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls); } - if (is_vid || is_vbi || is_sdr || is_tch) { - /* ioctls valid for video, metadata, vbi or sdr */ + if (is_vid || is_vbi || is_sdr || is_tch || is_meta) { + /* ioctls valid for video, vbi, sdr, touch and metadata */ SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs); SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf); SET_VALID_IOCTL(ops, VIDIOC_QBUF, vidioc_qbuf); @@ -694,8 +710,8 @@ static void determine_valid_ioctls(struct video_device *vdev) SET_VALID_IOCTL(ops, VIDIOC_STREAMOFF, vidioc_streamoff); } - if (is_vid || is_vbi || is_tch) { - /* ioctls valid for video or vbi */ + if (is_vid || is_vbi || is_tch || is_meta) { + /* ioctls valid for video, vbi, touch and metadata */ if (ops->vidioc_s_std) set_bit(_IOC_NR(VIDIOC_ENUMSTD), valid_ioctls); SET_VALID_IOCTL(ops, VIDIOC_S_STD, vidioc_s_std); diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 51b912743f0f..20b3107dd4e8 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -932,12 +932,22 @@ static int check_ext_ctrls(struct v4l2_ext_controls *c, int allow_priv) static int check_fmt(struct file *file, enum v4l2_buf_type type) { + const u32 vid_caps = V4L2_CAP_VIDEO_CAPTURE | + V4L2_CAP_VIDEO_CAPTURE_MPLANE | + V4L2_CAP_VIDEO_OUTPUT | + V4L2_CAP_VIDEO_OUTPUT_MPLANE | + V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE; + const u32 meta_caps = V4L2_CAP_META_CAPTURE | + V4L2_CAP_META_OUTPUT; struct video_device *vfd = video_devdata(file); const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops; - bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER; + bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER && + (vfd->device_caps & vid_caps); bool is_vbi = vfd->vfl_type == VFL_TYPE_VBI; bool is_sdr = vfd->vfl_type == VFL_TYPE_SDR; bool is_tch = vfd->vfl_type == VFL_TYPE_TOUCH; + bool is_meta = vfd->vfl_type == VFL_TYPE_GRABBER && + (vfd->device_caps & meta_caps); bool is_rx = vfd->vfl_dir != VFL_DIR_TX; bool is_tx = vfd->vfl_dir != VFL_DIR_RX; @@ -996,11 +1006,11 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type) return 0; break; case V4L2_BUF_TYPE_META_CAPTURE: - if (is_vid && is_rx && ops->vidioc_g_fmt_meta_cap) + if (is_meta && is_rx && ops->vidioc_g_fmt_meta_cap) return 0; break; case V4L2_BUF_TYPE_META_OUTPUT: - if (is_vid && is_tx && ops->vidioc_g_fmt_meta_out) + if (is_meta && is_tx && ops->vidioc_g_fmt_meta_out) return 0; break; default: