gpu/drm/radeon: fix two memleaks in radeon_vm_init

[ Upstream commit c2709b2d6a537ca0fa0f1da36fdaf07e48ef447d ]

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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 987cabbf1318e9f1ce4ef0fe8165c6d3e977f68b..c38b4d5d6a14f511426e44d3996e0f2f1cdd567c 100644 (file)
--- 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;
        }