mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
media: mediatek: vcodec: Can't set dst buffer to done when lat decode error
[ Upstream commit 3568ecd3f3
]
Core thread will call v4l2_m2m_buf_done to set dst buffer done for
lat architecture. If lat call v4l2_m2m_buf_done_and_job_finish to
free dst buffer when lat decode error, core thread will access kernel
NULL pointer dereference, then crash.
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
e5d01eb6dc
commit
eeb090420f
1 changed files with 1 additions and 1 deletions
|
@ -253,7 +253,7 @@ static void mtk_vdec_worker(struct work_struct *work)
|
||||||
|
|
||||||
state = ret ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE;
|
state = ret ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE;
|
||||||
if (!IS_VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch) ||
|
if (!IS_VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch) ||
|
||||||
ctx->current_codec == V4L2_PIX_FMT_VP8_FRAME || ret) {
|
ctx->current_codec == V4L2_PIX_FMT_VP8_FRAME) {
|
||||||
v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx, state);
|
v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx, state);
|
||||||
if (src_buf_req)
|
if (src_buf_req)
|
||||||
v4l2_ctrl_request_complete(src_buf_req, &ctx->ctrl_hdl);
|
v4l2_ctrl_request_complete(src_buf_req, &ctx->ctrl_hdl);
|
||||||
|
|
Loading…
Reference in a new issue