diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2159-drm-amdgpu-Fix-null-pointer-issue-in-amdgpu_cs_wait_.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2159-drm-amdgpu-Fix-null-pointer-issue-in-amdgpu_cs_wait_.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2159-drm-amdgpu-Fix-null-pointer-issue-in-amdgpu_cs_wait_.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2159-drm-amdgpu-Fix-null-pointer-issue-in-amdgpu_cs_wait_.patch new file mode 100644 index 00000000..76076183 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2159-drm-amdgpu-Fix-null-pointer-issue-in-amdgpu_cs_wait_.patch @@ -0,0 +1,41 @@ +From 69c5b1d785e44b7b970412c6db6c4da6c2bf294b Mon Sep 17 00:00:00 2001 +From: Emily Deng <Emily.Deng@amd.com> +Date: Thu, 9 Nov 2017 17:18:18 +0800 +Subject: [PATCH 2159/4131] drm/amdgpu: Fix null pointer issue in + amdgpu_cs_wait_any_fence +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The array[first] may be null when the fence has already been signaled. + +BUG: SWDEV-136239 + +Change-Id: I27d342d0677ee8b87a37d7c0df5df9e85f9d5d7a +Signed-off-by: Emily Deng <Emily.Deng@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 +++++-- + 1 file 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 1e54a45..1023d41 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -1551,8 +1551,11 @@ static int amdgpu_cs_wait_any_fence(struct amdgpu_device *adev, + 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++) +-- +2.7.4 + |