Received-SPF: pass (google.com: domain of linux-kernel+bounces-16226-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Precedence: bulk
MIME-Version: 1.0
References: <20231204091416.3308430-1-alexious@zju.edu.cn>
In-Reply-To: <20231204091416.3308430-1-alexious@zju.edu.cn>
From: Zack Rusin <zack.rusin@broadcom.com>
Date: Wed, 3 Jan 2024 22:28:23 -0500
Message-ID: <CABQX2QNtfJzT_iq0bdsYkz8eUG=r8c8jXyvJ=sp9ipwqfKSErw@mail.gmail.com>
Subject: Re: [PATCH] [v2] drm/vmwgfx: fix a memleak in vmw_gmrid_man_get_node
To: Zhipeng Lu <alexious@zju.edu.cn>
Cc: Zack Rusin <zackr@vmware.com>, 
	VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>, 
	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>, 
	Matthew Auld <matthew.auld@intel.com>, =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>, 
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Dec 4, 2023 at 4:15=E2=80=AFAM Zhipeng Lu <alexious@zju.edu.cn> wro=
te:
>
> When ida_alloc_max fails, resources allocated before should be freed,
> including *res allocated by kmalloc and ttm_resource_init.
>
> Fixes: d3bcb4b02fe9 ("drm/vmwgfx: switch the TTM backends to self alloc")
> Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
> ---
>
> Changelog:
>
> v2: Adding {} to correct the if statement
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/=
drm/vmwgfx/vmwgfx_gmrid_manager.c
> index ceb4d3d3b965..a0b47c9b33f5 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
> @@ -64,8 +64,11 @@ static int vmw_gmrid_man_get_node(struct ttm_resource_=
manager *man,
>         ttm_resource_init(bo, place, *res);
>
>         id =3D ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_K=
ERNEL);
> -       if (id < 0)
> +       if (id < 0) {
> +               ttm_resource_fini(man, *res);
> +               kfree(*res);
>                 return id;
> +       }
>
>         spin_lock(&gman->lock);

Thanks, I pushed it to drm-misc-next.

z