mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-01 20:42:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

media: rkvdec: Initialize the m2m context before the controls

Browse Source 
Setting up the control handler calls into .s_ctrl ops. While validating
the controls the ops may need to access some of the context state, which
could lead to a crash if not properly initialized.

Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
Nicolas Dufresne
2025-05-01 15:55:48 -04:00
committed by Hans Verkuil
parent 45029d3ee2
commit d43d7db3c8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/media/rkvdec/rkvdec.c
View File

@@ -871,24 +871,24 @@ static int rkvdec_open(struct file *filp)
rkvdec_reset_decoded_fmt(ctx);
v4l2_fh_init(&ctx->fh, video_devdata(filp));
ret = rkvdec_init_ctrls(ctx);
if (ret)
goto err_free_ctx;
ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(rkvdec->m2m_dev, ctx,
rkvdec_queue_init);
if (IS_ERR(ctx->fh.m2m_ctx)) {
ret = PTR_ERR(ctx->fh.m2m_ctx);
goto err_cleanup_ctrls;
goto err_free_ctx;
}
ret = rkvdec_init_ctrls(ctx);
if (ret)
goto err_cleanup_m2m_ctx;
filp->private_data = &ctx->fh;
v4l2_fh_add(&ctx->fh);
return 0;
err_cleanup_ctrls:
v4l2_ctrl_handler_free(&ctx->ctrl_hdl);
err_cleanup_m2m_ctx:
v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
err_free_ctx:
kfree(ctx);