* [PATCH] media: vcodec: Fix potential array out-of-bounds in vb2ops_venc_queue_setup
@ 2023-03-28 9:26 Wei Chen
2023-06-14 16:23 ` Tomasz Figa
2023-08-09 3:43 ` Chen-Yu Tsai
0 siblings, 2 replies; 4+ messages in thread
From: Wei Chen @ 2023-03-28 9:26 UTC (permalink / raw)
To: tiffany.lin
Cc: andrew-ct.chen, yunfei.dong, mchehab, matthias.bgg,
angelogioacchino.delregno, linux-media, linux-kernel,
linux-arm-kernel, linux-mediatek, Wei Chen
variable *nplanes is provided by user via system call argument. The
possible value of q_data->fmt->num_planes is 1-3, while the value
of *nplanes can be 1-8. The array access by index i can cause array
out-of-bounds.
Fix this bug by checking *nplanes against the array size.
Signed-off-by: Wei Chen <harperchen1110@gmail.com>
---
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
index d65800a3b89d..1ea02f9136f6 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
@@ -821,6 +821,8 @@ static int vb2ops_venc_queue_setup(struct vb2_queue *vq,
return -EINVAL;
if (*nplanes) {
+ if (*nplanes != q_data->fmt->num_planes)
+ return -EINVAL;
for (i = 0; i < *nplanes; i++)
if (sizes[i] < q_data->sizeimage[i])
return -EINVAL;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] media: vcodec: Fix potential array out-of-bounds in vb2ops_venc_queue_setup
2023-03-28 9:26 [PATCH] media: vcodec: Fix potential array out-of-bounds in vb2ops_venc_queue_setup Wei Chen
@ 2023-06-14 16:23 ` Tomasz Figa
2023-07-27 1:57 ` Tomasz Figa
2023-08-09 3:43 ` Chen-Yu Tsai
1 sibling, 1 reply; 4+ messages in thread
From: Tomasz Figa @ 2023-06-14 16:23 UTC (permalink / raw)
To: Wei Chen
Cc: tiffany.lin, andrew-ct.chen, yunfei.dong, mchehab, matthias.bgg,
angelogioacchino.delregno, linux-media, linux-kernel,
linux-arm-kernel, linux-mediatek
On Tue, Mar 28, 2023 at 6:26 PM Wei Chen <harperchen1110@gmail.com> wrote:
>
> variable *nplanes is provided by user via system call argument. The
> possible value of q_data->fmt->num_planes is 1-3, while the value
> of *nplanes can be 1-8. The array access by index i can cause array
> out-of-bounds.
>
> Fix this bug by checking *nplanes against the array size.
>
> Signed-off-by: Wei Chen <harperchen1110@gmail.com>
> ---
> drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> index d65800a3b89d..1ea02f9136f6 100644
> --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> @@ -821,6 +821,8 @@ static int vb2ops_venc_queue_setup(struct vb2_queue *vq,
> return -EINVAL;
>
> if (*nplanes) {
> + if (*nplanes != q_data->fmt->num_planes)
> + return -EINVAL;
> for (i = 0; i < *nplanes; i++)
> if (sizes[i] < q_data->sizeimage[i])
> return -EINVAL;
> --
> 2.25.1
>
Thanks for the patch, it makes sense indeed.
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] media: vcodec: Fix potential array out-of-bounds in vb2ops_venc_queue_setup
2023-06-14 16:23 ` Tomasz Figa
@ 2023-07-27 1:57 ` Tomasz Figa
0 siblings, 0 replies; 4+ messages in thread
From: Tomasz Figa @ 2023-07-27 1:57 UTC (permalink / raw)
To: mchehab, Hans Verkuil
Cc: tiffany.lin, andrew-ct.chen, yunfei.dong, matthias.bgg,
angelogioacchino.delregno, linux-media, linux-kernel,
linux-arm-kernel, linux-mediatek, Wei Chen
Hi Mauro, Hans,
On Thu, Jun 15, 2023 at 1:23 AM Tomasz Figa <tfiga@chromium.org> wrote:
>
> On Tue, Mar 28, 2023 at 6:26 PM Wei Chen <harperchen1110@gmail.com> wrote:
> >
> > variable *nplanes is provided by user via system call argument. The
> > possible value of q_data->fmt->num_planes is 1-3, while the value
> > of *nplanes can be 1-8. The array access by index i can cause array
> > out-of-bounds.
> >
> > Fix this bug by checking *nplanes against the array size.
> >
> > Signed-off-by: Wei Chen <harperchen1110@gmail.com>
> > ---
> > drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> > index d65800a3b89d..1ea02f9136f6 100644
> > --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> > +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> > @@ -821,6 +821,8 @@ static int vb2ops_venc_queue_setup(struct vb2_queue *vq,
> > return -EINVAL;
> >
> > if (*nplanes) {
> > + if (*nplanes != q_data->fmt->num_planes)
> > + return -EINVAL;
> > for (i = 0; i < *nplanes; i++)
> > if (sizes[i] < q_data->sizeimage[i])
> > return -EINVAL;
> > --
> > 2.25.1
> >
>
> Thanks for the patch, it makes sense indeed.
>
> Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Do you plan to pick this patch? Thanks.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] media: vcodec: Fix potential array out-of-bounds in vb2ops_venc_queue_setup
2023-03-28 9:26 [PATCH] media: vcodec: Fix potential array out-of-bounds in vb2ops_venc_queue_setup Wei Chen
2023-06-14 16:23 ` Tomasz Figa
@ 2023-08-09 3:43 ` Chen-Yu Tsai
1 sibling, 0 replies; 4+ messages in thread
From: Chen-Yu Tsai @ 2023-08-09 3:43 UTC (permalink / raw)
To: Wei Chen
Cc: tiffany.lin, andrew-ct.chen, yunfei.dong, mchehab, matthias.bgg,
angelogioacchino.delregno, linux-media, linux-kernel,
linux-arm-kernel, linux-mediatek
On Tue, Mar 28, 2023 at 09:26:08AM +0000, Wei Chen wrote:
> variable *nplanes is provided by user via system call argument. The
> possible value of q_data->fmt->num_planes is 1-3, while the value
> of *nplanes can be 1-8. The array access by index i can cause array
> out-of-bounds.
>
> Fix this bug by checking *nplanes against the array size.
This should have a fixes tag:
Fixes: 4e855a6efa54 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver")
And also CC the stable list:
Cc: stable@vger.kernel.org
> Signed-off-by: Wei Chen <harperchen1110@gmail.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
> ---
> drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> index d65800a3b89d..1ea02f9136f6 100644
> --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> @@ -821,6 +821,8 @@ static int vb2ops_venc_queue_setup(struct vb2_queue *vq,
> return -EINVAL;
>
> if (*nplanes) {
> + if (*nplanes != q_data->fmt->num_planes)
> + return -EINVAL;
> for (i = 0; i < *nplanes; i++)
> if (sizes[i] < q_data->sizeimage[i])
> return -EINVAL;
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-09 3:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-28 9:26 [PATCH] media: vcodec: Fix potential array out-of-bounds in vb2ops_venc_queue_setup Wei Chen
2023-06-14 16:23 ` Tomasz Figa
2023-07-27 1:57 ` Tomasz Figa
2023-08-09 3:43 ` Chen-Yu Tsai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).