Received-SPF: pass (google.com: domain of linux-kernel+bounces-30715-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <20240117071328.3811480-1-alexious@zju.edu.cn> <CAKGbVbuEyKaeZbvU-SREQkto5AqdQo-wjx=cjf2Sx3eDCnah+Q@mail.gmail.com>
In-Reply-To: <CAKGbVbuEyKaeZbvU-SREQkto5AqdQo-wjx=cjf2Sx3eDCnah+Q@mail.gmail.com>
From: Qiang Yu <yuq825@gmail.com>
Date: Fri, 19 Jan 2024 10:47:21 +0800
Message-ID: <CAKGbVbsp0Bhk3h3D4bkmpLT7HF6KykTJCUcb_JDL=UtJNc-h5A@mail.gmail.com>
Subject: Re: [PATCH] [v2] drm/lima: fix a memleak in lima_heap_alloc
To: Zhipeng Lu <alexious@zju.edu.cn>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, 
	Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, 
	Vasily Khoruzhick <anarsoul@gmail.com>, dri-devel@lists.freedesktop.org, 
	lima@lists.freedesktop.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

applied to drm-misc-next

On Wed, Jan 17, 2024 at 8:14=E2=80=AFPM Qiang Yu <yuq825@gmail.com> wrote:
>
> Reviewed-by: Qiang Yu <yuq825@gmail.com>
>
> On Wed, Jan 17, 2024 at 3:14=E2=80=AFPM Zhipeng Lu <alexious@zju.edu.cn> =
wrote:
> >
> > When lima_vm_map_bo fails, the resources need to be deallocated, or
> > there will be memleaks.
> >
> > Fixes: 6aebc51d7aef ("drm/lima: support heap buffer creation")
> > Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
> > ---
> > Changelog:
> >
> > v2: rearrange the error-handling to ladder tags.
> > ---
> >  drivers/gpu/drm/lima/lima_gem.c | 23 +++++++++++++++--------
> >  1 file changed, 15 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lim=
a_gem.c
> > index 4f9736e5f929..d3d82ee7fb4c 100644
> > --- a/drivers/gpu/drm/lima/lima_gem.c
> > +++ b/drivers/gpu/drm/lima/lima_gem.c
> > @@ -75,29 +75,36 @@ int lima_heap_alloc(struct lima_bo *bo, struct lima=
_vm *vm)
> >         } else {
> >                 bo->base.sgt =3D kmalloc(sizeof(*bo->base.sgt), GFP_KER=
NEL);
> >                 if (!bo->base.sgt) {
> > -                       sg_free_table(&sgt);
> > -                       return -ENOMEM;
> > +                       ret =3D -ENOMEM;
> > +                       goto err_out0;
> >                 }
> >         }
> >
> >         ret =3D dma_map_sgtable(dev, &sgt, DMA_BIDIRECTIONAL, 0);
> >         if (ret) {
> > -               sg_free_table(&sgt);
> > -               kfree(bo->base.sgt);
> > -               bo->base.sgt =3D NULL;
> > -               return ret;
> > +               goto err_out1;
> >         }
> >
> >         *bo->base.sgt =3D sgt;
> >
> >         if (vm) {
> >                 ret =3D lima_vm_map_bo(vm, bo, old_size >> PAGE_SHIFT);
> > -               if (ret)
> > -                       return ret;
> > +               if (ret) {
> > +                       goto err_out2;
> > +               }
> >         }
> >
> >         bo->heap_size =3D new_size;
> >         return 0;
> > +
> > +err_out2:
> > +       dma_unmap_sgtable(dev, &sgt, DMA_BIDIRECTIONAL, 0);
> > +err_out1:
> > +       kfree(bo->base.sgt);
> > +       bo->base.sgt =3D NULL;
> > +err_out0:
> > +       sg_free_table(&sgt);
> > +       return ret;
> >  }
> >
> >  int lima_gem_create_handle(struct drm_device *dev, struct drm_file *fi=
le,
> > --
> > 2.34.1
> >