From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA237C433E6 for ; Thu, 11 Mar 2021 23:44:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8984164FA7 for ; Thu, 11 Mar 2021 23:44:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230118AbhCKXoA (ORCPT ); Thu, 11 Mar 2021 18:44:00 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:43348 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbhCKXn4 (ORCPT ); Thu, 11 Mar 2021 18:43:56 -0500 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1397F88F; Fri, 12 Mar 2021 00:43:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1615506235; bh=ozdy96rbUlmL2Ihxn0PG6hwkkYtEpwgXYdHM9705AMI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=kVQLcod2wwgzihfDu3o5vUGu6gn0/3sCSaNcyAcCmgmfFY0+rouz6/G7HTqWOYIr0 VmA9lwbqzET6HfcT2riGjIS00piDzthtvdNtVC0IcSn4oaJmiSomz8+wSi6+oLaq0L M+lgzsaleod/Bo+cVELPh3XptqDJT89ecKYuncBo= Date: Fri, 12 Mar 2021 01:43:21 +0200 From: Laurent Pinchart To: Ricardo Ribalda Cc: Mauro Carvalho Chehab , Tomasz Figa , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, senozhatsky@chromium.org, Hans Verkuil , stable@vger.kernel.org, Hans Verkuil Subject: Re: [PATCH v2 1/6] media: v4l2-ioctl: Fix check_ext_ctrls Message-ID: References: <20210311221946.1319924-1-ribalda@chromium.org> <20210311221946.1319924-2-ribalda@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210311221946.1319924-2-ribalda@chromium.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Ricardo, Thank you for the patch. On Thu, Mar 11, 2021 at 11:19:41PM +0100, 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 > Signed-off-by: Ricardo Ribalda > --- > drivers/media/v4l2-core/v4l2-ioctl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c > index 31d1342e61e8..6f6b310e2802 100644 > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > @@ -924,8 +924,10 @@ static int check_ext_ctrls(struct v4l2_ext_controls *c, int allow_priv) > */ > if (!allow_priv && c->which == V4L2_CID_PRIVATE_BASE) > return 0; > - if (!c->which) > + if (!c->which || c->which == V4L2_CTRL_WHICH_DEF_VAL) How about if (c->which == V4L2_CTRL_WHICH_CUR_VAL || c->which == V4L2_CTRL_WHICH_DEF_VAL) > return 1; > + if (c->which == V4L2_CTRL_WHICH_REQUEST_VAL) > + return 0; Or possibly switch (c->which) { case V4L2_CTRL_WHICH_CUR_VAL: case V4L2_CTRL_WHICH_DEF_VAL: return 1; case V4L2_CTRL_WHICH_REQUEST_VAL: return 0; } Reviewed-by: Laurent Pinchart > /* 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) { -- Regards, Laurent Pinchart