[PATCH] drm/amdgpu: fix multiple memory leaks

[Navid Emamdoost]

Thanks Christian for the feedback, I'll send a v2.



On Wed, Sep 18, 2019 at 12:31 PM Koenig, Christian <Christian.Koenig at amd.com>
wrote:

> Am 18.09.19 um 18:09 schrieb Navid Emamdoost:
> > In acp_hw_init there are some allocations that needs to be released in
> > case of failure:
> >
> > 1- adev->acp.acp_genpd should be released if any allocation attemp for
> > adev->acp.acp_cell, adev->acp.acp_res or i2s_pdata fails.
> > 2- all of those allocations should be released if pm_genpd_add_device
> > fails.
>
> Good catch, but please use goto error handling instead of adding more
> and more kfree calls.
>
> Regards,
> Christian.
>
> >
> > Signed-off-by: Navid Emamdoost <navid.emamdoost at gmail.com>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 10 +++++++++-
> >   1 file changed, 9 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
> > index eba42c752bca..dd3fa85b11c5 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
> > @@ -231,17 +231,21 @@ static int acp_hw_init(void *handle)
> >       adev->acp.acp_cell = kcalloc(ACP_DEVS, sizeof(struct mfd_cell),
> >                                                       GFP_KERNEL);
> >
> > -     if (adev->acp.acp_cell == NULL)
> > +     if (adev->acp.acp_cell == NULL) {
> > +             kfree(adev->acp.acp_genpd);
> >               return -ENOMEM;
> > +     }
> >
> >       adev->acp.acp_res = kcalloc(5, sizeof(struct resource),
> GFP_KERNEL);
> >       if (adev->acp.acp_res == NULL) {
> > +             kfree(adev->acp.acp_genpd);
> >               kfree(adev->acp.acp_cell);
> >               return -ENOMEM;
> >       }
> >
> >       i2s_pdata = kcalloc(3, sizeof(struct i2s_platform_data),
> GFP_KERNEL);
> >       if (i2s_pdata == NULL) {
> > +             kfree(adev->acp.acp_genpd);
> >               kfree(adev->acp.acp_res);
> >               kfree(adev->acp.acp_cell);
> >               return -ENOMEM;
> > @@ -348,6 +352,10 @@ static int acp_hw_init(void *handle)
> >               r = pm_genpd_add_device(&adev->acp.acp_genpd->gpd, dev);
> >               if (r) {
> >                       dev_err(dev, "Failed to add dev to genpd\n");
> > +                     kfree(adev->acp.acp_genpd);
> > +                     kfree(adev->acp.acp_res);
> > +                     kfree(adev->acp.acp_cell);
> > +                     kfree(i2s_pdata);
> >                       return r;
> >               }
> >       }
>
>

-- 
Navid.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20190918/c5378dba/attachment-0001.html>