From patchwork Thu Nov 9 16:34:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 163486 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp559179vqs; Thu, 9 Nov 2023 08:39:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IGP0BXetfiC2sQT9DB/mX5IOq/xyhwbwbNjROsgiVcKk77aRWwkbRFdzx2KRkcr0sWKOhNC X-Received: by 2002:a17:903:230a:b0:1c9:d46e:d52d with SMTP id d10-20020a170903230a00b001c9d46ed52dmr6003750plh.64.1699547961291; Thu, 09 Nov 2023 08:39:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699547961; cv=none; d=google.com; s=arc-20160816; b=VFN2YMawmVPLB9Eom0PGnXq2OL3vV63pOhyYv4MAF3CDyBpBgE2ARuR2VYOiY/ZrTY WNcfVYCOsVqjJesKiYUlXhMP9yFhuZBpPJe1yMf5FPnqxManD0pUsH/WpLlBoAOU+gN/ rj9ddg2i34r2A6wFiJU4mJR0LqZ22sMTluBVS3xRJWTsgTDXL1JIWTErJPJtfLuZ3qE9 H70UbrquXign1Ifk+R4tCRa9LYR6k8ODEfnc5+f6jltyBJ1Citf50lpPZavIKhI0748+ 8rszaWw64PkSL+mSxOicz1J3tCPy0wWErSevajSoesHkuuRZeIsVNhCqf1vR+DWst4l5 X4Mw== 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=OME6r1NGhMdl2U+XmcICLDGse64QdsQ3q4/W520XtZ0=; fh=t4h1l+tS8anPNnwyX0PglXAWKg/D9M9NAbc0AP3vdGI=; b=kE2w0Hktc/vFST4eRmha6NqSaeQSoOFvktvcYGhFPwnvE5X9oSykuekV7YbSvDQh3l Ia10d0TfPAoBy2KxWmnYti56VKTEz73wyjBhbj6vZrHUP4/jrfKwgckY4noSKPgdSyes x2LBot8ipVWv3qPyyiHWjBklbGLt2bH/2mDZmtVqpvT0nNVQe0xEaRwk+BM1RImrWuGn v5ztdsdi+YbAwTsFqZzZY5+gNoJK/EBrqehsOxkOOyM6STfz9XE8jnuUwzpk0IMWw52R QliqzaRyTN9fytrXYyq8qjmuIuw9ijv3LRL2uA20rp81zEq2CSKgFEhjXntiyrs0Cgvc AXbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=VxCsnAu5; 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 d2-20020a170903230200b001c72b13a1cbsi5699957plh.352.2023.11.09.08.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 08:39:21 -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=VxCsnAu5; 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 7CCC8832A402; Thu, 9 Nov 2023 08:38:58 -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 S1344278AbjKIQiC (ORCPT + 31 others); Thu, 9 Nov 2023 11:38:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344310AbjKIQhu (ORCPT ); Thu, 9 Nov 2023 11:37:50 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9EF73852; Thu, 9 Nov 2023 08:37:47 -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 9775A66076A5; Thu, 9 Nov 2023 16:37:45 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699547866; bh=KuGYMXGgeorOvF4/Aiwj3OYSrc4WmXD1A3tlAdH9F3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VxCsnAu5DiMOxnka7oWekfguQPXa6HLtGB1j+cH+TmJddYB9NRecHBr4Pn/6gM3bQ t6Eslvpz8IMXoGeVbzoui1igpnFUiNuE74EwmiWXWUwxsjGWM5QDcEk01JiO5Sa8cr 2owyo9Nopcxv8UllX9ljmRvfWEwhiZODFfx9bUZEdmtZB4HA7yNLtZzuuzp4gFLu3b RWI37125DbpzBOUYUV6AQVE2kjg/z1nVkqv0t5F0wemftKxa8fmuKAO7AsLK6Q7ZsO RINphQwGA/DHzvY5I9L/3fbFXDxXYQO7JwhYYlpQjgJfxQ/Yh4mIoEF9o7P7ClascO 5Dr+nz+MjhMnw== 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 18/56] media: dvb-core: Use vb2_get_buffer() instead of directly access to buffers array Date: Thu, 9 Nov 2023 17:34:34 +0100 Message-Id: <20231109163512.179524-19-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231109163512.179524-14-benjamin.gaignard@collabora.com> References: <20231109163512.179524-14-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:38:58 -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: 1782105202711571477 X-GMAIL-MSGID: 1782105202711571477 Use vb2_get_buffer() instead of direct access to the vb2_queue bufs array. This allows us to change the type of the bufs in the future. After each call to vb2_get_buffer() we need to be sure that we get a valid pointer so check the return value of all of them. Signed-off-by: Benjamin Gaignard Reviewed-by: Andrzej Pietrasiewicz --- drivers/media/dvb-core/dvb_vb2.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/media/dvb-core/dvb_vb2.c b/drivers/media/dvb-core/dvb_vb2.c index b322ef179f05..3a966fdf814c 100644 --- a/drivers/media/dvb-core/dvb_vb2.c +++ b/drivers/media/dvb-core/dvb_vb2.c @@ -355,12 +355,13 @@ int dvb_vb2_reqbufs(struct dvb_vb2_ctx *ctx, struct dmx_requestbuffers *req) int dvb_vb2_querybuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b) { struct vb2_queue *q = &ctx->vb_q; + struct vb2_buffer *vb2 = vb2_get_buffer(q, b->index); - if (b->index >= q->num_buffers) { - dprintk(1, "[%s] buffer index out of range\n", ctx->name); + if (!vb2) { + dprintk(1, "[%s] invalid buffer index\n", ctx->name); return -EINVAL; } - vb2_core_querybuf(&ctx->vb_q, q->bufs[b->index], b); + vb2_core_querybuf(&ctx->vb_q, vb2, b); dprintk(3, "[%s] index=%d\n", ctx->name, b->index); return 0; } @@ -385,13 +386,14 @@ int dvb_vb2_expbuf(struct dvb_vb2_ctx *ctx, struct dmx_exportbuffer *exp) int dvb_vb2_qbuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b) { struct vb2_queue *q = &ctx->vb_q; + struct vb2_buffer *vb2 = vb2_get_buffer(q, b->index); int ret; - if (b->index >= q->num_buffers) { - dprintk(1, "[%s] buffer index out of range\n", ctx->name); + if (!vb2) { + dprintk(1, "[%s] invalid buffer index\n", ctx->name); return -EINVAL; } - ret = vb2_core_qbuf(&ctx->vb_q, q->bufs[b->index], b, NULL); + ret = vb2_core_qbuf(&ctx->vb_q, vb2, b, NULL); if (ret) { dprintk(1, "[%s] index=%d errno=%d\n", ctx->name, b->index, ret);