On 26/09/2023 12:19, Irui Wang wrote:
> There will be a kernel null pointer exception if 'vsi' is NULL, check
> 'vsi' is not NULL before assign it to encoder instance.
>
> Signed-off-by: Irui Wang <irui.wang@xxxxxxxxxxxx>
> ---
> .../platform/mediatek/vcodec/encoder/venc/venc_h264_if.c | 5 +++++
> .../platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c | 5 +++++
> 2 files changed, 10 insertions(+)
>
> diff --git a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c
> index a68dac72c4e4..385bcc0d14f3 100644
> --- a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c
> +++ b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c
> @@ -597,6 +597,11 @@ static int h264_enc_init(struct mtk_vcodec_enc_ctx *ctx)
> inst->hw_base = mtk_vcodec_get_reg_addr(inst->ctx->dev->reg_base, VENC_SYS);
>
> ret = vpu_enc_init(&inst->vpu_inst);
> + if (!inst->vpu_inst.vsi) {
> + mtk_venc_err(ctx, "share buffer is NULL");
> + kfree(inst);
> + return -EFAULT;
> + }
Shouldn't this check be done in vpu_enc_init?
It looks weird that a function can return 0, but there is still an
error that needs to be checked manually afterwards.
Regards,
Hans
>
> if (MTK_ENC_IOVA_IS_34BIT(ctx))
> inst->vsi_34 = (struct venc_h264_vsi_34 *)inst->vpu_inst.vsi;
> diff --git a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c
> index 05abca91e742..23ca0d93324f 100644
> --- a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c
> +++ b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c
> @@ -326,6 +326,11 @@ static int vp8_enc_init(struct mtk_vcodec_enc_ctx *ctx)
> inst->hw_base = mtk_vcodec_get_reg_addr(inst->ctx->dev->reg_base, VENC_LT_SYS);
>
> ret = vpu_enc_init(&inst->vpu_inst);
> + if (!inst->vpu_inst.vsi) {
> + mtk_venc_err(ctx, "share buffer is NULL");
> + kfree(inst);
> + return -EFAULT;
> + }
>
> inst->vsi = (struct venc_vp8_vsi *)inst->vpu_inst.vsi;
>
