Skip to content

Commit f04ec98

Browse files
xiaoleiwang123456gregkh
authored andcommitted
media: nxp: imx8-isi: Add missing v4l2_subdev_cleanup() in crossbar and pipe
commit 567418e upstream. Both mxc_isi_crossbar_init() and mxc_isi_pipe_init() call v4l2_subdev_init_finalize() which allocates the subdev active state, but neither mxc_isi_crossbar_cleanup() nor mxc_isi_pipe_cleanup() calls v4l2_subdev_cleanup() to free it. This causes a memory leak on every rmmod, reported by kmemleak: unreferenced object 0xffff0000d06fc800 (size 192): comm "(udev-worker)", pid 254, jiffies 4294913455 backtrace (crc 36eeae58): kmemleak_alloc+0x34/0x40 __kvmalloc_node_noprof+0x5f8/0x7d8 __v4l2_subdev_state_alloc+0x1fc/0x30c __v4l2_subdev_init_finalize+0x178/0x368 Add the missing v4l2_subdev_cleanup() calls before media_entity_cleanup() in both crossbar and pipe cleanup paths. Fixes: cf21f32 ("media: nxp: Add i.MX8 ISI driver") Cc: stable@vger.kernel.org Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://patch.msgid.link/20260507041318.491594-3-xiaolei.wang@windriver.com Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b092d69 commit f04ec98

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ int mxc_isi_crossbar_init(struct mxc_isi_dev *isi)
494494

495495
void mxc_isi_crossbar_cleanup(struct mxc_isi_crossbar *xbar)
496496
{
497+
v4l2_subdev_cleanup(&xbar->sd);
497498
media_entity_cleanup(&xbar->sd.entity);
498499
kfree(xbar->pads);
499500
kfree(xbar->inputs);

drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,7 @@ void mxc_isi_pipe_cleanup(struct mxc_isi_pipe *pipe)
819819
{
820820
struct v4l2_subdev *sd = &pipe->sd;
821821

822+
v4l2_subdev_cleanup(sd);
822823
media_entity_cleanup(&sd->entity);
823824
mutex_destroy(&pipe->lock);
824825
}

0 commit comments

Comments
 (0)