From patchwork Tue Sep 20 14:11:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 608138 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22513C6FA90 for ; Tue, 20 Sep 2022 14:14:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231706AbiITONa (ORCPT ); Tue, 20 Sep 2022 10:13:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231580AbiITONK (ORCPT ); Tue, 20 Sep 2022 10:13:10 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA19E1A380 for ; Tue, 20 Sep 2022 07:11:25 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id q21so4008219edc.9 for ; Tue, 20 Sep 2022 07:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=LybwIQYtr5MkOTsSbogVgHlZvfV5O5f7swHU1e23Nnk=; b=XGpXPObUCIdcbW6+kATPE1pa0rJOXlPSqXnXWxFCMfrdei94sbWnWOguM4Szh4xAz5 qw3MeS//hxpC/16vm9+/7bKhnPZ1S+einB3uW2QlJzNPzg6us/9Kwz0VzjoouFyemWOP SLj6xaKOTLbyfGjzHyMu4JgLdaQJ+K37OTYx0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date; bh=LybwIQYtr5MkOTsSbogVgHlZvfV5O5f7swHU1e23Nnk=; b=em7U5Ej+k2NkkhaX2+DeOM0m3Nucu0eiDKnYw7EBsbcp+xW7C+FJggYAEci+zsijkJ lGZqswaL1hJ/4xw/Hlp1xvRvoQrwgkTew1BrSRRL1810IXSRQT+n6fh9/BG6A4eujhSd SrBoWtUihIOm8LtNxXcWjoR+W3WwJ9LF+qk8GeTAkMknzH+CDZHt1ANSo0tJ73YdDHbr vHrX2rNI4vW8mARilSgdGVE2ABsA1FAbhexZKfM7L9RmQSZCy9gozpIhM9SPNa2blXs8 MprxcsSEgExUjvJdUM1hmoHQd15shx6kRIdIjgUIKZ3OS1bUisLgM9qTGf+Q5aAMYVEa JrVA== X-Gm-Message-State: ACrzQf1sLHGUjtNwJceUOvGL6b0XueNXI5HwrW9NVjjQHv3cX5hbA09D p5AVb377n89IWippcsyPoqXPsw== X-Google-Smtp-Source: AMsMyM6GueK/ScSoEqg+pIo2Qo627Mmr5ypK8TeU2+MpGfijHbEmj7S/BGDsKKkFvndBRaJ42Aqo9A== X-Received: by 2002:a05:6402:b85:b0:44e:dad7:3e24 with SMTP id cf5-20020a0564020b8500b0044edad73e24mr21080703edb.264.1663683083754; Tue, 20 Sep 2022 07:11:23 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id b24-20020aa7c918000000b004518ee90b4dsm129668edt.1.2022.09.20.07.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:11:23 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:11:07 +0200 Subject: [PATCH v1 4/5] media: uvcvideo: Do not return positive errors in uvc_query_ctrl() MIME-Version: 1.0 Message-Id: <20220920-resend-v4l2-compliance-v1-4-81364c15229b@chromium.org> References: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=835; i=ribalda@chromium.org; h=from:subject:message-id; bh=lvRGgJW7MhPUQfG+nYO+p570MCZiCiBKUgYSsY4PyFM=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcoBYgbZrbg5ljLAWYbJnhg/lWzmT9LI8kdMIM6Y A04RZISJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynKAQAKCRDRN9E+zzrEiMJfD/ 9mQFTZGV9/PXf7DjRSKX9FoxJQmOgiqY4qZ5id+f7u+hpqhJmjnQgYEBPaWvIan+xqNkPMN5IxotY5 nZT4mrnDNc2tr9NSaPHwpV5CGjYpDgvWIV8ABMSnFHwmJ9njolndOOccOVrsro1w6IYKJPEnH3oelC p8A+oEPhsZdgqHTWlsO53mBY2+YVnQLSxaOwSblTpjV5BhAcSedYDObFMUVAped0NjJP+O0eGpgGQn qAQtmEh/QtsV0cZtt21RxZPFGAndVcI3xvA3/XH4646eyrzE/FsgIltSlwgSlwWrw1nzgVx+iVP7rX cJihDQ+akf4ssGXcfb3+gLwuXA8ywMED5/Gl9ZvWz5DLSV82WbPeS8l7YtnMRteimSUfOnaiIO1Tmh P/TOyPtL39wZFBKRU4iuwVuaXmsL0lkIOgjncsQsXP3n/upFns28GiBKuI5z2F6qr68lDsn2Oy0ZB0 hkKsNPLgjA2yxJQixUSYO6GvlCis5DdizE5E0MkRBgVnoTfU8mpy1u1Ae7Yji0p+4T/0h4hSdV890L 8nZAgdV8oOs/A+yEFtnupy3g9ZyRSHbcoitHpnHdosH5/Gh9C4dydk0mb4h5uP8NxCOejt/sTkOOwa JrKqUEsprp6uDE+lIFW0jJJ+G0nr1fACK8qNMpXHlivWP0K4nhFbiNN+cKLA== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org If the returned size of the query does not match the expected size or it is zero, return -EPIPE instead of 0 or a positive value. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 497073a50194..902f2817a743 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -83,7 +83,7 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, dev_err(&dev->udev->dev, "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n", uvc_query_name(query), cs, unit, ret, size); - return ret; + return ret < 0 ? ret : -EPIPE; } /* reuse data[0] to request the error code. */