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 v8 07/53] media: sti: hva: Use vb2_get_buffer() instead of directly access to buffers array
Date: Wed, 27 Sep 2023 17:35:12 +0200 [thread overview]
Message-ID: <20230927153558.159278-8-benjamin.gaignard@collabora.com> (raw)
In-Reply-To: <20230927153558.159278-1-benjamin.gaignard@collabora.com>
Use vb2_get_buffer() instead of directly access to vb2_buffer buffer array.
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.
Remove index range test since it is done by vb2_get_buffer().
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
drivers/media/platform/st/sti/hva/hva-v4l2.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/st/sti/hva/hva-v4l2.c b/drivers/media/platform/st/sti/hva/hva-v4l2.c
index 3a848ca32a0e..cfe83e9dc01b 100644
--- a/drivers/media/platform/st/sti/hva/hva-v4l2.c
+++ b/drivers/media/platform/st/sti/hva/hva-v4l2.c
@@ -569,14 +569,11 @@ static int hva_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
struct vb2_buffer *vb2_buf;
vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, buf->type);
-
- if (buf->index >= vq->num_buffers) {
- dev_dbg(dev, "%s buffer index %d out of range (%d)\n",
- ctx->name, buf->index, vq->num_buffers);
+ vb2_buf = vb2_get_buffer(vq, buf->index);
+ if (!vb2_buf) {
+ dev_dbg(dev, "%s buffer index %d not found\n", ctx->name, buf->index);
return -EINVAL;
}
-
- vb2_buf = vb2_get_buffer(vq, buf->index);
stream = to_hva_stream(to_vb2_v4l2_buffer(vb2_buf));
stream->bytesused = buf->bytesused;
}
--
2.39.2
next prev parent reply other threads:[~2023-09-27 15:36 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 15:35 [PATCH v8 00/53] Add DELETE_BUF ioctl Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 01/53] media: videobuf2: Rework offset 'cookie' encoding pattern Benjamin Gaignard
2023-09-30 8:52 ` Hans Verkuil
2023-09-27 15:35 ` [PATCH v8 02/53] media: videobuf2: Stop spamming kernel log with all queue counter Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 03/53] media: videobuf2: Use vb2_buffer instead of index Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 04/53] media: amphion: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 05/53] media: mediatek: jpeg: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 06/53] media: mediatek: vdec: Remove useless loop Benjamin Gaignard
2023-09-27 15:35 ` Benjamin Gaignard [this message]
2023-09-27 15:35 ` [PATCH v8 08/53] media: visl: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 09/53] media: atomisp: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 10/53] media: dvb-core: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 11/53] media: videobuf2: Access vb2_queue bufs array through helper functions Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 12/53] media: videobuf2: Be more flexible on the number of queue stored buffers Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 13/53] media: Report the maximum possible number of buffers for the queue Benjamin Gaignard
2023-10-02 13:37 ` Hans Verkuil
2023-10-02 13:46 ` Benjamin Gaignard
2023-10-02 13:49 ` Hans Verkuil
2023-09-27 15:35 ` [PATCH v8 14/53] media: test-drivers: vivid: Increase max supported buffers for capture queues Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 15/53] media: test-drivers: vicodec: Increase max supported capture queue buffers Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 16/53] media: verisilicon: Refactor postprocessor to store more buffers Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 17/53] media: verisilicon: Store chroma and motion vectors offset Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 18/53] media: verisilicon: g2: Use common helpers to compute chroma and mv offsets Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 19/53] media: verisilicon: vp9: Allow to change resolution while streaming Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 20/53] media: Remove duplicated index vs q->num_buffers check Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 21/53] media: core: Add helper to get queue number of buffers Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 22/53] media: dvb-core: Do not initialize twice queue num_buffer field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 23/53] media: dvb-frontends: rtl2832_srd: Use queue min_buffers_needed field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 24/53] media: video-i2c: Set min_buffers_needed to 2 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 25/53] media: pci: cx18: Set correct value to min_buffers_needed field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 26/53] media: pci: dt3155: Remove useless check Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 27/53] media: pci: netup_unidvb: Remove useless number of buffers check Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 28/53] media: pci: tw68: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 29/53] media: pci: tw686x: Set min_buffers_needed to 3 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 30/53] media: amphion: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 31/53] media: coda: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 32/53] media: mediatek: vcodec: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 33/53] media: nxp: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 34/53] media: renesas: Set min_buffers_needed to 16 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 35/53] media: ti: Use queue min_buffers_needed field to set the min number of buffers Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 36/53] media: verisilicon: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 37/53] media: test-drivers: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 38/53] media: usb: airspy: Set min_buffers_needed to 8 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 39/53] media: usb: cx231xx: Set min_buffers_needed to CX231XX_MIN_BUF Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 40/53] media: usb: hackrf: Set min_buffers_needed to 8 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 41/53] media: usb: usbtv: Set min_buffers_needed to 2 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 42/53] media: atomisp: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 43/53] media: imx: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 44/53] media: meson: vdec: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 45/53] touchscreen: sur40: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 46/53] sample: v4l: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 47/53] media: cedrus: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 48/53] media: core: Rework how create_buf index returned value is computed Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 49/53] media: core: Add bitmap manage bufs array entries Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 50/53] media: core: Free range of buffers Benjamin Gaignard
2023-09-30 5:09 ` kernel test robot
2023-09-27 15:35 ` [PATCH v8 51/53] media: v4l2: Add DELETE_BUFS ioctl Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 52/53] media: v4l2: Add mem2mem helpers for " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 53/53] media: test-drivers: Use helper " Benjamin Gaignard
2023-09-28 13:04 ` [PATCH v8 00/53] Add DELETE_BUF ioctl Hans Verkuil
2023-09-28 13:16 ` Benjamin Gaignard
2023-09-29 11:44 ` Benjamin Gaignard
2023-09-29 13:17 ` 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=20230927153558.159278-8-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