* [PATCH v2] media: mediatek: vcodec: Handle invalid encoder vsi
@ 2023-10-07 11:33 Irui Wang
2023-10-09 12:39 ` AngeloGioacchino Del Regno
0 siblings, 1 reply; 2+ messages in thread
From: Irui Wang @ 2023-10-07 11:33 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, Matthias Brugger,
angelogioacchino.delregno, nicolas.dufresne, Yunfei Dong,
Irui Wang
Cc: Project_Global_Chrome_Upstream_Group, linux-media, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek, Maoguang Meng
Handle invalid encoder vsi in vpu_enc_init to ensure the encoder
vsi is valid for future use.
Fixes: 1972e32431ed ("media: mediatek: vcodec: Fix possible invalid memory access for encoder")
Signed-off-by: Irui Wang <irui.wang@mediatek.com>
---
changed with v1:
- add Fixes tag
- move vsi check to vpu_enc_init
- update commit message
---
drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c b/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
index d299cc2962a5..39e8f3ac53ca 100644
--- a/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
+++ b/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
@@ -153,6 +153,11 @@ int vpu_enc_init(struct venc_vpu_inst *vpu)
return -EINVAL;
}
+ if (IS_ERR_OR_NULL(vpu->vsi)) {
+ mtk_venc_err(vpu->ctx, "invalid venc vsi");
+ return -EINVAL;
+ }
+
return 0;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] media: mediatek: vcodec: Handle invalid encoder vsi
2023-10-07 11:33 [PATCH v2] media: mediatek: vcodec: Handle invalid encoder vsi Irui Wang
@ 2023-10-09 12:39 ` AngeloGioacchino Del Regno
0 siblings, 0 replies; 2+ messages in thread
From: AngeloGioacchino Del Regno @ 2023-10-09 12:39 UTC (permalink / raw)
To: Irui Wang, Hans Verkuil, Mauro Carvalho Chehab, Matthias Brugger,
nicolas.dufresne, Yunfei Dong
Cc: Project_Global_Chrome_Upstream_Group, linux-media, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek, Maoguang Meng
Il 07/10/23 13:33, Irui Wang ha scritto:
> Handle invalid encoder vsi in vpu_enc_init to ensure the encoder
> vsi is valid for future use.
>
> Fixes: 1972e32431ed ("media: mediatek: vcodec: Fix possible invalid memory access for encoder")
>
> Signed-off-by: Irui Wang <irui.wang@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-09 12:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-07 11:33 [PATCH v2] media: mediatek: vcodec: Handle invalid encoder vsi Irui Wang
2023-10-09 12:39 ` AngeloGioacchino Del Regno
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).