Commit 0381ac3c authored by Xiaohui Zhang's avatar Xiaohui Zhang Committed by Alex Deucher
Browse files

drm/radeon: Initialize fences array entries in radeon_sa_bo_next_hole 



Similar to the handling of amdgpu_sa_bo_next_hole in commit 6a15f3ff
("drm/amdgpu: Initialize fences array entries in amdgpu_sa_bo_next_hole"),
we thought a patch might be needed here as well.

The entries were only initialized once in radeon_sa_bo_new. If a fence
wasn't signalled yet in the first radeon_sa_bo_next_hole call, but then
got signalled before a later radeon_sa_bo_next_hole call, it could
destroy the fence but leave its pointer in the array, resulting in
use-after-free in radeon_sa_bo_new.

Signed-off-by: default avatarXiaohui Zhang <xiaohuizhang@ruc.edu.cn>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4e2d1044

drivers/gpu/drm/radeon/radeon_sa.c

+3 −3
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ static bool radeon_sa_bo_next_hole(struct radeon_sa_manager *sa_manager, 
	for (i = 0; i < RADEON_NUM_RINGS; ++i) {

		struct radeon_sa_bo *sa_bo;



		fences[i] = NULL;



		if (list_empty(&sa_manager->flist[i])) {

			continue;

		}
@@ -332,10 +334,8 @@ int radeon_sa_bo_new(struct radeon_device *rdev, 


	spin_lock(&sa_manager->wq.lock);

	do {

		for (i = 0; i < RADEON_NUM_RINGS; ++i) {

			fences[i] = NULL;

		for (i = 0; i < RADEON_NUM_RINGS; ++i)

			tries[i] = 0;

		}



		do {

			radeon_sa_bo_try_free(sa_manager);