media: rkvdec: Initialize the m2m context before the controls

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>

diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
index 65c6f1d07a493e017ae941780b823d41314a49b8..7b780392bb6a63cc954655ef940e87146d2b852f 100644 (file)
--- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -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);