]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: imx: csc/scaler: fix v4l2_ctrl_handler memory leak
authorLucas Stach <l.stach@pengutronix.de>
Wed, 31 Jan 2024 12:00:33 +0000 (13:00 +0100)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:57 +0000 (18:21 -0400)
[ Upstream commit 4797a3dd46f220e6d83daf54d70c5b33db6deb01 ]

Free the memory allocated in v4l2_ctrl_handler_init on release.

Fixes: a8ef0488cc59 ("media: imx: add csc/scaler mem2mem device")
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/media/imx/imx-media-csc-scaler.c

index 63a0204502a8bb4bf552e0ed68339a5124c41bc2..939843b895440b501bdc57380885a6c4586aa27e 100644 (file)
@@ -803,6 +803,7 @@ static int ipu_csc_scaler_release(struct file *file)
 
        dev_dbg(priv->dev, "Releasing instance %p\n", ctx);
 
+       v4l2_ctrl_handler_free(&ctx->ctrl_hdlr);
        v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
        v4l2_fh_del(&ctx->fh);
        v4l2_fh_exit(&ctx->fh);