diff options
| author | Emily Deng <Emily.Deng@amd.com> | 2017-11-09 17:18:18 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-11-09 18:11:47 -0500 |
| commit | cdadab89f8cc37dd6101e2bbab50037d72e0e1d0 (patch) | |
| tree | a1c24f194732f66c9bb84f62d14b144bfe997b21 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | ab6613b7eaefe85dadfc86025e901c55d71c0379 (diff) | |
| download | talos-obmc-linux-cdadab89f8cc37dd6101e2bbab50037d72e0e1d0.tar.gz talos-obmc-linux-cdadab89f8cc37dd6101e2bbab50037d72e0e1d0.zip | |
drm/amdgpu: Fix null pointer issue in amdgpu_cs_wait_any_fence
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index f7fceb63413c..146e05f21d35 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -1497,8 +1497,11 @@ out: memset(wait, 0, sizeof(*wait)); wait->out.status = (r > 0); wait->out.first_signaled = first; - /* set return value 0 to indicate success */ - r = array[first]->error; + + if (array[first]) + r = array[first]->error; + else + r = 0; err_free_fence_array: for (i = 0; i < fence_count; i++) |
