Linux-mediatek Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
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 <benjamin.gaignard@collabora.com>
Subject: [PATCH v10 05/54] media: mediatek: jpeg: Use vb2_get_buffer() instead of directly access to buffers array
Date: Tue,  3 Oct 2023 10:06:14 +0200	[thread overview]
Message-ID: <20231003080704.43911-6-benjamin.gaignard@collabora.com> (raw)
In-Reply-To: <20231003080704.43911-1-benjamin.gaignard@collabora.com>

Use vb2_get_buffer() instead of directly access to vb2_buffer buffer array.
This could allow to change the type bufs[] field of vb2_buffer structure if
needed.
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 <benjamin.gaignard@collabora.com>
---
 drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
index 7194f88edc0f..73a063b1569b 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
@@ -598,12 +598,11 @@ static int mtk_jpeg_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
 		goto end;
 
 	vq = v4l2_m2m_get_vq(fh->m2m_ctx, buf->type);
-	if (buf->index >= vq->num_buffers) {
-		dev_err(ctx->jpeg->dev, "buffer index out of range\n");
+	vb = vb2_get_buffer(vq, buf->index);
+	if (!vb) {
+		dev_err(ctx->jpeg->dev, "buffer not found\n");
 		return -EINVAL;
 	}
-
-	vb = vq->bufs[buf->index];
 	jpeg_src_buf = mtk_jpeg_vb2_to_srcbuf(vb);
 	jpeg_src_buf->bs_size = buf->m.planes[0].bytesused;
 
-- 
2.39.2



  parent reply	other threads:[~2023-10-03  8:07 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-03  8:06 [PATCH v10 00/54] Add DELETE_BUF ioctl Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 01/54] media: videobuf2: Rework offset 'cookie' encoding pattern Benjamin Gaignard
2023-10-04  8:31   ` Sakari Ailus
2023-10-11  8:04   ` Hans Verkuil
2023-10-03  8:06 ` [PATCH v10 02/54] media: videobuf2: Stop spamming kernel log with all queue counter Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 03/54] media: videobuf2: Use vb2_buffer instead of index Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 04/54] media: amphion: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-10-03  8:06 ` Benjamin Gaignard [this message]
2023-10-03  8:06 ` [PATCH v10 06/54] media: mediatek: vdec: Remove useless loop Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 07/54] media: sti: hva: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 08/54] media: visl: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 09/54] media: atomisp: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 10/54] media: dvb-core: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 11/54] media: videobuf2: Access vb2_queue bufs array through helper functions Benjamin Gaignard
2023-10-11  8:44   ` Hans Verkuil
2023-10-11  9:32     ` Benjamin Gaignard
2023-10-11  9:36       ` Hans Verkuil
2023-10-03  8:06 ` [PATCH v10 12/54] media: videobuf2: Be more flexible on the number of queue stored buffers Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 13/54] media: Report the maximum possible number of buffers for the queue Benjamin Gaignard
2023-10-11  8:53   ` Hans Verkuil
2023-10-03  8:06 ` [PATCH v10 14/54] media: test-drivers: vivid: Increase max supported buffers for capture queues Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 15/54] media: test-drivers: vicodec: Increase max supported capture queue buffers Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 16/54] media: verisilicon: Refactor postprocessor to store more buffers Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 17/54] media: verisilicon: Store chroma and motion vectors offset Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 18/54] media: verisilicon: g2: Use common helpers to compute chroma and mv offsets Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 19/54] media: verisilicon: vp9: Allow to change resolution while streaming Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 20/54] media: Remove duplicated index vs q->num_buffers check Benjamin Gaignard
2023-10-11  8:54   ` Hans Verkuil
2023-10-03  8:06 ` [PATCH v10 21/54] media: core: Add helper to get queue number of buffers Benjamin Gaignard
2023-10-11  8:56   ` Hans Verkuil
2023-10-03  8:06 ` [PATCH v10 22/54] media: dvb-core: Do not initialize twice queue num_buffer field Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 23/54] media: dvb-frontends: rtl2832_srd: Use queue min_buffers_needed field Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 24/54] media: video-i2c: Set min_buffers_needed to 2 Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 25/54] media: pci: cx18: Set correct value to min_buffers_needed field Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 26/54] media: pci: dt3155: Remove useless check Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 27/54] media: pci: netup_unidvb: Remove useless number of buffers check Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 28/54] media: pci: tw68: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 29/54] media: pci: tw686x: Set min_buffers_needed to 3 Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 30/54] media: amphion: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 31/54] media: coda: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 32/54] media: mediatek: vcodec: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 33/54] media: nxp: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 34/54] media: renesas: Set min_buffers_needed to 16 Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 35/54] media: ti: Use queue min_buffers_needed field to set the min number of buffers Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 36/54] media: verisilicon: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 37/54] media: test-drivers: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 38/54] media: usb: airspy: Set min_buffers_needed to 8 Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 39/54] media: usb: cx231xx: Set min_buffers_needed to CX231XX_MIN_BUF Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 40/54] media: usb: hackrf: Set min_buffers_needed to 8 Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 41/54] media: usb: usbtv: Set min_buffers_needed to 2 Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 42/54] media: atomisp: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 43/54] media: imx: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 44/54] media: meson: vdec: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 45/54] touchscreen: sur40: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 46/54] sample: v4l: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 47/54] media: cedrus: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 48/54] media: nuvoton: " Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 49/54] media: core: Rework how create_buf index returned value is computed Benjamin Gaignard
2023-10-03  8:06 ` [PATCH v10 50/54] media: core: Add bitmap manage bufs array entries Benjamin Gaignard
2023-10-03  8:07 ` [PATCH v10 51/54] media: core: Free range of buffers Benjamin Gaignard
2023-10-03  8:07 ` [PATCH v10 52/54] media: v4l2: Add DELETE_BUFS ioctl Benjamin Gaignard
2023-10-03  8:07 ` [PATCH v10 53/54] media: v4l2: Add mem2mem helpers for " Benjamin Gaignard
2023-10-03  8:07 ` [PATCH v10 54/54] media: test-drivers: Use helper " Benjamin Gaignard
2023-10-11  9:25 ` [PATCH v10 00/54] Add DELETE_BUF ioctl Hans Verkuil

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=20231003080704.43911-6-benjamin.gaignard@collabora.com \
    --to=benjamin.gaignard@collabora.com \
    --cc=ezequiel@vanguardiasur.com.ar \
    --cc=gregkh@linuxfoundation.org \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=kernel@collabora.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=m.szyprowski@samsung.com \
    --cc=mchehab@kernel.org \
    --cc=ming.qian@nxp.com \
    --cc=nicolas.dufresne@collabora.com \
    --cc=p.zabel@pengutronix.de \
    --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