iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: mediatek: vcodec: Handle invalid encoder vsi

Browse Source 
[ Upstream commit 19e2e01f30 ]

Handle invalid encoder vsi in vpu_enc_init to ensure the encoder
vsi is valid for future use.

Fixes: 1972e32431 ("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>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Irui Wang
2023-10-07 19:33:47 +08:00
committed by Greg Kroah-Hartman
parent 0747b6f7a3
commit a4b31459ce
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
View File

@ -154,6 +154,11 @@ int vpu_enc_init(struct venc_vpu_inst *vpu)
return -EINVAL; return -EINVAL;
} }
if (IS_ERR_OR_NULL(vpu->vsi)) {
mtk_venc_err(vpu->ctx, "invalid venc vsi");
return -EINVAL;
}
return 0; return 0;
} }