Commit 06f7f57e authored Oct 03, 2019 by Philip Yang Committed by Alex Deucher Oct 15, 2019

drm/amdgpu: user pages array memory leak fix

user_pages array should always be freed after validation regardless if
user pages are changed after bo is created because with HMM change parse
bo always allocate user pages array to get user pages for userptr bo.

v2: remove unused local variable and amend commit

v3: add back get user pages in gem_userptr_ioctl, to detect application
bug where an userptr VMA is not ananymous memory and reject it.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1844962



Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Tested-by: Joe Barnett <thejoe@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 7bbdbe40

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -474,7 +474,6 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,

		list_for_each_entry(lobj, validated, tv.head) {
		struct amdgpu_bo *bo = ttm_to_amdgpu_bo(lobj->tv.bo);
		bool binding_userptr = false;
		struct mm_struct *usermm;

		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);
		@@ -491,18 +490,15 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,

		amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
		lobj->user_pages);
		binding_userptr = true;
		}

		r = amdgpu_cs_validate(p, bo);
		if (r)
		return r;

		if (binding_userptr) {
		kvfree(lobj->user_pages);
		lobj->user_pages = NULL;
		}
		}
		return 0;
		}

Admin message