2024-03-21 01:48:18

by Irui Wang (王瑞)

[permalink] [raw]
Subject: [PATCH v2] media: mediatek: vcodec: Handle invalid decoder vsi

Handle invalid decoder vsi in vpu_dec_init to ensure the decoder vsi is
valid for future use.

Fixes: 590577a4e525 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Decoder Driver")

Signed-off-by: Irui Wang <[email protected]>
---
changed with v1:
- add Fixes tag
---
.../media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
index 82e57ae983d5..17770993fe5a 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
@@ -231,6 +231,12 @@ int vpu_dec_init(struct vdec_vpu_inst *vpu)
mtk_vdec_debug(vpu->ctx, "vdec_inst=%p", vpu);

err = vcodec_vpu_send_msg(vpu, (void *)&msg, sizeof(msg));
+
+ if (IS_ERR_OR_NULL(vpu->vsi)) {
+ mtk_vdec_err(vpu->ctx, "invalid vdec vsi, status=%d", err);
+ return -EINVAL;
+ }
+
mtk_vdec_debug(vpu->ctx, "- ret=%d", err);
return err;
}
--
2.18.0



Subject: Re: [PATCH v2] media: mediatek: vcodec: Handle invalid decoder vsi

Il 21/03/24 02:47, Irui Wang ha scritto:
> Handle invalid decoder vsi in vpu_dec_init to ensure the decoder vsi is
> valid for future use.
>
> Fixes: 590577a4e525 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Decoder Driver")
>

There shouldn't be extra lines between Fixes: and S-o-b: tags, but I guess this
can be fixed while applying the patch.

> Signed-off-by: Irui Wang <[email protected]>

Reviewed-by: AngeloGioacchino Del Regno <[email protected]>