From patchwork Thu Nov 9 16:29:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 163472 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp556744vqs; Thu, 9 Nov 2023 08:35:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGxvnDuz+GztuNCbaPpAGgm+5d23C3JawsHUS4LP4NYUTHbHHgYwbZ1GYltSuXpviZdirtR X-Received: by 2002:a05:6a20:158a:b0:17b:3822:e5ea with SMTP id h10-20020a056a20158a00b0017b3822e5eamr5271392pzj.19.1699547705607; Thu, 09 Nov 2023 08:35:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699547705; cv=none; d=google.com; s=arc-20160816; b=MmIxiQhcwaXRu55WcWVMmDXu0z6yyFUNsSq7j5dimpW9gGiYw+J7NooydUBnJsKlG8 9WZcRax8rT+BQ8eDzNFGQZ/emXWDujqFfH/WvUdZjiE9jaunDeg6+BCPsulCplinPCow 3exQnKUH1r9noib3HXx5flP5p4t+4MFDvFI/HeoXACKUZo9MBg0Z22DE/8d0dYYIOoir RgNxnrnljsmINhfKrGYJc1ABN7fJybkEmImQt25dRIftAUTyjZ49e+4WwkWhRPScBi1b JYCXemBMYW/HEi9V6kRwP9OinAMzV4671MT3oWFNqKQywbCv62hTwMOBS7EdOIOY1ro2 AmRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IsPkIsvsfb0uJxNZUW7N/nqDqJwRhPAt3G+478gHam0=; fh=t4h1l+tS8anPNnwyX0PglXAWKg/D9M9NAbc0AP3vdGI=; b=bZYU/Ee3/EnQIP99M45xkRtmkPXEDOw38a9xvpbveo9JzhyjcJfDv4+CdGtX2dmB50 Zd+Kz6ZRe+sbeKnbwPaFUh8VHLHFv8m6+8D53qtjv4KhBvxA+OATOtuKHdW9WoY7nuRr HTIFXa0ACEeHJHHZVGpIBxHu6Ihdu3VEVN9cr8WdxuXZGYDbCLr0L1422UQ5HBbrHHYg BmuQ2joN3jpaA7LDfpmotKtqf0j9HNw3HbDrBbgRO0T5jusdHlupuMoouR2075pXQy9a FFaHvVpOdI9myDOOHEVIiVsz4nRkX2kUOm1mCbQO1hL2yHiEf2DW1OLsx9+CjiGgSxKR NFug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=mCuHsiAS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id h191-20020a636cc8000000b005b106cd44d1si6975277pgc.486.2023.11.09.08.35.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 08:35:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=mCuHsiAS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id A41CB82735CB; Thu, 9 Nov 2023 08:34:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344314AbjKIQcv (ORCPT + 31 others); Thu, 9 Nov 2023 11:32:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344119AbjKIQcj (ORCPT ); Thu, 9 Nov 2023 11:32:39 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8ADA3845; Thu, 9 Nov 2023 08:32:37 -0800 (PST) Received: from benjamin-XPS-13-9310.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by madras.collabora.co.uk (Postfix) with ESMTPSA id 8680166076A8; Thu, 9 Nov 2023 16:32:35 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699547556; bh=3b/dx2P81ZUhQ9IbGSLS7lMvQsWaifDH6Xromp4oCdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mCuHsiASxnXFKmcAKg1+O+g4ocUXrRRzRH9bXPhsDlcrNckr9sqdOZ0XlSohKLLJp 0bvXhPxTg3Egn+lnXgaSWAthF3P4ebNhBnS6oOMfgdxSJRF39+op6NNEKY6jzvoJ1q b+Pv3qxnvEOd1EkbDy0oUstwWpTkTWkbbiczwA2wYTuRBg1nL9GYUG3GReQimIxD++ 3l4UfZDztP5ru5ZrCrkP+nLNEJNRsQwNabBmQNKdSrhNcl11yzcSvPHoMNLmVyaJZs l9FJfz/zfc8ov76TXcG92qj5aIuhJMJpkSLYA1JW8lgQNsEfuKLYUKKzQ1s7pC4pCz CHWq1QjSay/OQ== From: Benjamin Gaignard To: mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, ming.qian@nxp.com, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Andrzej Pietrasiewicz Subject: [PATCH v15 06/56] media: videobuf2: Remove duplicated index vs q->num_buffers check Date: Thu, 9 Nov 2023 17:29:18 +0100 Message-Id: <20231109163008.179152-7-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231109163008.179152-1-benjamin.gaignard@collabora.com> References: <20231109163008.179152-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 09 Nov 2023 08:34:36 -0800 (PST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782104934882562189 X-GMAIL-MSGID: 1782104934882562189 vb2_get_buffer() already checks if the requested index is valid. Stop duplicating this kind of check everywhere. Signed-off-by: Benjamin Gaignard Reviewed-by: Andrzej Pietrasiewicz --- drivers/media/common/videobuf2/videobuf2-v4l2.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c index 37f814a89ace..6ba13a95323c 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -817,10 +817,6 @@ int vb2_qbuf(struct vb2_queue *q, struct media_device *mdev, return -EBUSY; } - if (b->index >= q->num_buffers) { - dprintk(q, 1, "buffer index out of range\n"); - return -EINVAL; - } vb = vb2_get_buffer(q, b->index); if (!vb) { dprintk(q, 1, "can't find the requested buffer %u\n", b->index); @@ -892,10 +888,6 @@ int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb) { struct vb2_buffer *vb; - if (eb->index >= q->num_buffers) { - dprintk(q, 1, "buffer index out of range\n"); - return -EINVAL; - } vb = vb2_get_buffer(q, eb->index); if (!vb) { dprintk(q, 1, "can't find the requested buffer %u\n", eb->index);