| Message ID | 20230209090200.8667-1-jiasheng@iscas.ac.cn |
|---|---|
| State | Accepted |
| Commit | d00f592250782538cda87745607695b0fe27dcd4 |
| Headers | show |
| Series | media: platform: mtk-mdp3: Add missing check and free for ida_alloc | expand |
diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c index 5f74ea3b7a52..857098f1d71d 100644 --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c @@ -567,6 +567,11 @@ static int mdp_m2m_open(struct file *file) } ctx->id = ida_alloc(&mdp->mdp_ida, GFP_KERNEL); + if (!ctx->id) { + ret = -ENOMEM; + goto err_unlock_mutex; + } + ctx->mdp_dev = mdp; v4l2_fh_init(&ctx->fh, vdev); @@ -617,6 +622,8 @@ static int mdp_m2m_open(struct file *file) v4l2_fh_del(&ctx->fh); err_exit_fh: v4l2_fh_exit(&ctx->fh); + ida_free(&mdp->mdp_ida, ctx->id); +err_unlock_mutext: mutex_unlock(&mdp->m2m_lock); err_free_ctx: kfree(ctx);
Add the check for the return value of the ida_alloc in order to avoid NULL pointer dereference. Moreover, free allocated "ctx->id" if mdp_m2m_open fails later in order to avoid memory leak. Fixes: 61890ccaefaf ("media: platform: mtk-mdp3: add MediaTek MDP3 driver") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> --- drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 7 +++++++ 1 file changed, 7 insertions(+)