[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <b7c19673-a3bd-449a-9e84-49a68c89b0ea@xs4all.nl>
Date: Thu, 5 Oct 2023 10:43:18 +0200
From: Hans Verkuil <hverkuil-cisco@...all.nl>
To: Irui Wang <irui.wang@...iatek.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Matthias Brugger <matthias.bgg@...il.com>,
angelogioacchino.delregno@...labora.com,
nicolas.dufresne@...labora.com,
Yunfei Dong <yunfei.dong@...iatek.com>
Cc: Project_Global_Chrome_Upstream_Group@...iatek.com,
linux-media@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org,
Maoguang Meng <maoguang.meng@...iatek.com>
Subject: Re: [PATCH 2/2] media: mediatek: vcodec: Handle encoder vsi NULL
pointer case
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@...iatek.com>
> ---
> .../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;
>
Powered by blists - more mailing lists