Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
MIME-Version: 1.0
References: <20231214165843.3484373-1-alexious@zju.edu.cn>
In-Reply-To: <20231214165843.3484373-1-alexious@zju.edu.cn>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Thu, 14 Dec 2023 12:09:14 -0500
Message-ID: <CADnq5_OFhh_-qn9DdKWM5mhRWKfHWX027K95qyBUsqUao6vwHg@mail.gmail.com>
Subject: Re: [PATCH] gpu/drm/radeon: fix two memleaks in radeon_vm_init
To:     Zhipeng Lu <alexious@zju.edu.cn>
Cc:     "Pan, Xinhui" <Xinhui.Pan@amd.com>, linux-kernel@vger.kernel.org,
        amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied.  Thanks!

On Thu, Dec 14, 2023 at 11:59=E2=80=AFAM Zhipeng Lu <alexious@zju.edu.cn> w=
rote:
>
> When radeon_bo_create and radeon_vm_clear_bo fail, the vm->page_tables
> allocated before need to be freed. However, neither radeon_vm_init
> itself nor its caller have done such deallocation.
>
> Fixes: 6d2f2944e95e ("drm/radeon: use normal BOs for the page tables v4")
> Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
> ---
>  drivers/gpu/drm/radeon/radeon_vm.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/=
radeon_vm.c
> index 987cabbf1318..c38b4d5d6a14 100644
> --- a/drivers/gpu/drm/radeon/radeon_vm.c
> +++ b/drivers/gpu/drm/radeon/radeon_vm.c
> @@ -1204,13 +1204,17 @@ int radeon_vm_init(struct radeon_device *rdev, st=
ruct radeon_vm *vm)
>         r =3D radeon_bo_create(rdev, pd_size, align, true,
>                              RADEON_GEM_DOMAIN_VRAM, 0, NULL,
>                              NULL, &vm->page_directory);
> -       if (r)
> +       if (r) {
> +               kfree(vm->page_tables);
> +               vm->page_tables =3D NULL;
>                 return r;
> -
> +       }
>         r =3D radeon_vm_clear_bo(rdev, vm->page_directory);
>         if (r) {
>                 radeon_bo_unref(&vm->page_directory);
>                 vm->page_directory =3D NULL;
> +               kfree(vm->page_tables);
> +               vm->page_tables =3D NULL;
>                 return r;
>         }
>
> --
> 2.34.1
>