From: Irui Wang <irui.wang@mediatek.com>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
<angelogioacchino.delregno@collabora.com>,
<nicolas.dufresne@collabora.com>,
Yunfei Dong <yunfei.dong@mediatek.com>,
Irui Wang <irui.wang@mediatek.com>
Cc: <Project_Global_Chrome_Upstream_Group@mediatek.com>,
<linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
Maoguang Meng <maoguang.meng@mediatek.com>
Subject: [PATCH 2/2] media: mediatek: vcodec: Handle encoder vsi NULL pointer case
Date: Tue, 26 Sep 2023 18:19:09 +0800 [thread overview]
Message-ID: <20230926101909.15030-2-irui.wang@mediatek.com> (raw)
In-Reply-To: <20230926101909.15030-1-irui.wang@mediatek.com>
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@mediatek.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;
+ }
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;
--
2.25.1
next prev parent reply other threads:[~2023-09-26 10:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 10:19 [PATCH 1/2] media: mediatek: vcodec: Fix encoder access NULL pointer Irui Wang
2023-09-26 10:19 ` Irui Wang [this message]
2023-10-02 10:25 ` [PATCH 2/2] media: mediatek: vcodec: Handle encoder vsi NULL pointer case Hans Verkuil
2023-10-02 10:48 ` AngeloGioacchino Del Regno
2023-10-02 11:34 ` AngeloGioacchino Del Regno
2023-10-05 8:43 ` Hans Verkuil
2023-10-07 6:16 ` Irui Wang (王瑞)
2023-10-02 10:24 ` [PATCH 1/2] media: mediatek: vcodec: Fix encoder access NULL pointer Hans Verkuil
2023-10-04 6:54 ` Hans Verkuil
2023-10-05 8:46 ` Hans Verkuil
2023-10-07 1:49 ` Irui Wang (王瑞)
2023-10-02 10:48 ` AngeloGioacchino Del Regno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230926101909.15030-2-irui.wang@mediatek.com \
--to=irui.wang@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=maoguang.meng@mediatek.com \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=yunfei.dong@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome