Re: [PATCH 3/3] media: imx8-isi: fix resource leaks in probe error paths and remove

[xiaolei wang]

Hi Frank

Thank you for your review

On 5/5/26 00:21, Frank Li wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On Sat, Apr 25, 2026 at 07:19:26AM +0800, Xiaolei Wang wrote:
> > mxc_isi_probe() allocates isi->pipes with kzalloc_objs() but never
> > frees it on any probe failure path or in mxc_isi_remove(), leaking
> > the allocation on every failed probe and every normal unbind.
> >
> > Additionally, when mxc_isi_pipe_init() fails partway through the
> > channel loop or when mxc_isi_v4l2_init() fails, the already
> > initialized pipes are not cleaned up — their media entities and
> > mutexes are leaked.
> Although it simple change, it is two problems, suggest use two patches to
> fix it.

Yes, it's two issues, and I will use two patches in the next version.

thanks

xiaolei

> Frank
> > Fix the pipes memory leak by switching from kzalloc_objs() to
> > devm_kcalloc(), which ties the allocation lifetime to the device
> > and eliminates the need for explicit kfree() in all error paths
> > and in mxc_isi_remove().
> >
> > Fix the pipe init leak by cleaning up already-initialized pipes
> > in the err_xbar error path.
> >
> > Fixes: cf21f328fcaf ("media: nxp: Add i.MX8 ISI driver")
> > Cc: stable@xxxxxxxxxxxxxxx
> > Signed-off-by: Xiaolei Wang <xiaolei.wang@xxxxxxxxxxxxx>
> > ---
> >   drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 5 ++++-
> >   1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> > index 2d639b789910..8533a979d60a 100644
> > --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> > +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> > @@ -485,7 +485,8 @@ static int mxc_isi_probe(struct platform_device *pdev)
> >
> >        isi->pdata = of_device_get_match_data(dev);
> >
> > -     isi->pipes = kzalloc_objs(isi->pipes[0], isi->pdata->num_channels);
> > +     isi->pipes = devm_kcalloc(dev, isi->pdata->num_channels,
> > +                               sizeof(*isi->pipes), GFP_KERNEL);
> >        if (!isi->pipes)
> >                return -ENOMEM;
> >
> > @@ -538,6 +539,8 @@ static int mxc_isi_probe(struct platform_device *pdev)
> >        return 0;
> >
> >   err_xbar:
> > +     while (i--)
> > +             mxc_isi_pipe_cleanup(&isi->pipes[i]);
> >        mxc_isi_crossbar_cleanup(&isi->crossbar);
> >
> >        return ret;
> > --
> > 2.43.0