leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: Fix null pointer issue in amdgpu_cs_wait_any_fence

Browse Source 
The array[first] may be null when the fence has already been signaled.

BUG: SWDEV-136239

Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Emily Deng
2017-11-09 17:18:18 +08:00
committed by Alex Deucher
parent ab6613b7ea
commit cdadab89f8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
View File

@@ -1497,8 +1497,11 @@ out:
memset(wait, 0, sizeof(*wait)); memset(wait, 0, sizeof(*wait));
wait->out.status = (r > 0); wait->out.status = (r > 0);
wait->out.first_signaled = first; wait->out.first_signaled = first;
/* set return value 0 to indicate success */
if (array[first])
r = array[first]->error; r = array[first]->error;
else
r = 0;
err_free_fence_array: err_free_fence_array:
for (i = 0; i < fence_count; i++) for (i = 0; i < fence_count; i++)