diff mbox series

gpu/drm/radeon: fix two memleaks in radeon_vm_init

Message ID 20231214165843.3484373-1-alexious@zju.edu.cn
State New
Headers
Series gpu/drm/radeon: fix two memleaks in radeon_vm_init |

Commit Message

Zhipeng Lu Dec. 14, 2023, 4:58 p.m. UTC 
  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(-)

Comments

Alex Deucher Dec. 14, 2023, 5:09 p.m. UTC | #1 
Applied.  Thanks!

On Thu, Dec 14, 2023 at 11:59 AM Zhipeng Lu <alexious@zju.edu.cn> wrote:
>
> 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, struct radeon_vm *vm)
>         r = 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 = NULL;
>                 return r;
> -
> +       }
>         r = radeon_vm_clear_bo(rdev, vm->page_directory);
>         if (r) {
>                 radeon_bo_unref(&vm->page_directory);
>                 vm->page_directory = NULL;
> +               kfree(vm->page_tables);
> +               vm->page_tables = NULL;
>                 return r;
>         }
>
> --
> 2.34.1
>
diff mbox series

Patch

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, struct radeon_vm *vm)
 	r = 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 = NULL;
 		return r;
-
+	}
 	r = radeon_vm_clear_bo(rdev, vm->page_directory);
 	if (r) {
 		radeon_bo_unref(&vm->page_directory);
 		vm->page_directory = NULL;
+		kfree(vm->page_tables);
+		vm->page_tables = NULL;
 		return r;
 	}