From: Emily Deng Date: Thu, 9 Nov 2017 09:18:18 +0000 (+0800) Subject: drm/amdgpu: Fix null pointer issue in amdgpu_cs_wait_any_fence X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cdadab89f8cc37dd6101e2bbab50037d72e0e1d0;p=linux.git 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 Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index f7fceb63413c9..146e05f21d35a 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++)