From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
To: Ricardo Ribalda <ribalda@chromium.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
tfiga@chromium.org
Cc: stable@vger.kernel.org
Subject: Re: [PATCH v5 01/13] media: v4l2-ioctl: Fix check_ext_ctrls
Date: Wed, 17 Mar 2021 11:36:31 +0100 [thread overview]
Message-ID: <176411ad-97de-ab83-d5f3-1977cadcbcfa@xs4all.nl> (raw)
In-Reply-To: <20210316180004.1605727-2-ribalda@chromium.org>
On 16/03/2021 18:59, Ricardo Ribalda wrote:
> Drivers that do not use the ctrl-framework use this function instead.
>
> - Return error when handling of REQUEST_VAL.
> - Do not check for multiple classes when getting the DEF_VAL.
>
> Fixes v4l2-compliance:
> Control ioctls (Input 0):
> fail: v4l2-test-controls.cpp(813): doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls)
> test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL
>
> Cc: stable@vger.kernel.org
> Fixes: 6fa6f831f095 ("media: v4l2-ctrls: add core request support")
> Suggested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/v4l2-core/v4l2-ioctl.c | 25 +++++++++++++++++--------
> 1 file changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> index 31d1342e61e8..9406e90ff805 100644
> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> @@ -917,15 +917,24 @@ static int check_ext_ctrls(struct v4l2_ext_controls *c, int allow_priv)
allow_priv really should be a bool.
> for (i = 0; i < c->count; i++)
> c->controls[i].reserved2[0] = 0;
>
> - /* V4L2_CID_PRIVATE_BASE cannot be used as control class
> - when using extended controls.
> - Only when passed in through VIDIOC_G_CTRL and VIDIOC_S_CTRL
> - is it allowed for backwards compatibility.
> - */
> - if (!allow_priv && c->which == V4L2_CID_PRIVATE_BASE)
> - return 0;
> - if (!c->which)
> + switch (c->which) {
> + case V4L2_CID_PRIVATE_BASE:
> + /*
> + * V4L2_CID_PRIVATE_BASE cannot be used as control class
> + * when using extended controls.
> + * Only when passed in through VIDIOC_G_CTRL and VIDIOC_S_CTRL
> + * is it allowed for backwards compatibility.
> + */
> + if (!allow_priv)
> + return 0;
> + break;
> + case V4L2_CTRL_WHICH_DEF_VAL:
I think it would be better if a second bool 'is_get' argument is added that is true
for g_ctrl and g_ext_ctrls: then you can do a 'return is_get;' here. That way drivers
do not need to take care of V4L2_CTRL_WHICH_DEF_VAL for set/try.
Regards,
Hans
> + case V4L2_CTRL_WHICH_CUR_VAL:
> return 1;
> + case V4L2_CTRL_WHICH_REQUEST_VAL:
> + return 0;
> + }
> +
> /* Check that all controls are from the same control class. */
> for (i = 0; i < c->count; i++) {
> if (V4L2_CTRL_ID2WHICH(c->controls[i].id) != c->which) {
>
next prev parent reply other threads:[~2021-03-17 10:37 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 17:59 [PATCH v5 00/13] uvcvideo: Fix v4l2-compliance errors Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 01/13] media: v4l2-ioctl: Fix check_ext_ctrls Ricardo Ribalda
2021-03-17 10:36 ` Hans Verkuil [this message]
2021-03-16 17:59 ` [PATCH v5 02/13] media: uvcvideo: Set capability in s_param Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 03/13] media: uvcvideo: Return -EIO for control errors Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 04/13] media: uvcvideo: Check controls flags before accessing them Ricardo Ribalda
2021-03-17 10:50 ` Hans Verkuil
2021-03-16 17:59 ` [PATCH v5 05/13] media: uvcvideo: refactor __uvc_ctrl_add_mapping Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 06/13] media: uvcvideo: Add support for V4L2_CTRL_TYPE_CTRL_CLASS Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 07/13] media: uvcvideo: Use dev->name for querycap() Ricardo Ribalda
2021-03-17 10:57 ` Hans Verkuil
2021-03-16 17:59 ` [PATCH v5 08/13] media: uvcvideo: Set unique vdev name based in type Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 09/13] media: uvcvideo: Increase the size of UVC_METADATA_BUF_SIZE Ricardo Ribalda
2021-03-17 11:01 ` Hans Verkuil
2021-03-16 18:00 ` [PATCH v5 10/13] media: uvcvideo: Return -EACCES to inactive controls Ricardo Ribalda
2021-03-17 11:26 ` Hans Verkuil
2021-03-16 18:00 ` [PATCH v5 11/13] media: uvcvideo: Use control names from framework Ricardo Ribalda
2021-03-17 11:29 ` Hans Verkuil
2021-03-16 18:00 ` [PATCH v5 12/13] media: v4l2-ioctl: Set error_idx to the right value Ricardo Ribalda
2021-03-17 11:39 ` Hans Verkuil
2021-03-16 18:00 ` [PATCH v5 13/13] uvc: use vb2 ioctl and fop helpers Ricardo Ribalda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=176411ad-97de-ab83-d5f3-1977cadcbcfa@xs4all.nl \
--to=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=ribalda@chromium.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=stable@vger.kernel.org \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).