Received-SPF: pass (google.com: domain of linux-kernel+bounces-26906-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240112084750.3729837-1-alexious@zju.edu.cn>
In-Reply-To: <20240112084750.3729837-1-alexious@zju.edu.cn>
From: Qiang Yu <yuq825@gmail.com>
Date: Tue, 16 Jan 2024 09:24:37 +0800
Message-ID: <CAKGbVbswTUYJsZDLWao58MTyt7yAYMMXA5zjeYVBTRvd9X3n0g@mail.gmail.com>
Subject: Re: [PATCH] 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

Thanks for the fix. As the error handling gets longer and duplicated,
could you rearrange them like the lima_gem_submit():
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.

Regards,
Qiang

On Fri, Jan 12, 2024 at 4:49=E2=80=AFPM Zhipeng Lu <alexious@zju.edu.cn> wr=
ote:
>
> 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>
> ---
>  drivers/gpu/drm/lima/lima_gem.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_=
gem.c
> index 4f9736e5f929..824ed22141c7 100644
> --- a/drivers/gpu/drm/lima/lima_gem.c
> +++ b/drivers/gpu/drm/lima/lima_gem.c
> @@ -92,8 +92,13 @@ int lima_heap_alloc(struct lima_bo *bo, struct lima_vm=
 *vm)
>
>         if (vm) {
>                 ret =3D lima_vm_map_bo(vm, bo, old_size >> PAGE_SHIFT);
> -               if (ret)
> +               if (ret) {
> +                       dma_unmap_sgtable(dev, &sgt, DMA_BIDIRECTIONAL, 0=
);
> +                       sg_free_table(&sgt);
> +                       kfree(bo->base.sgt);
> +                       bo->base.sgt =3D NULL;
>                         return ret;
> +               }
>         }
>
>         bo->heap_size =3D new_size;
> --
> 2.34.1
>