diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0285-drm-amdgpu-add-chunk-id-validity-check.patch')
| -rw-r--r-- | meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0285-drm-amdgpu-add-chunk-id-validity-check.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0285-drm-amdgpu-add-chunk-id-validity-check.patch b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0285-drm-amdgpu-add-chunk-id-validity-check.patch new file mode 100644 index 00000000..35e41a2a --- /dev/null +++ b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0285-drm-amdgpu-add-chunk-id-validity-check.patch @@ -0,0 +1,56 @@ +From 9a5e8fb1c8372ea4b58a76bbb82cb97683bb204b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 23 Jun 2015 17:07:03 +0200 +Subject: [PATCH 0285/1050] drm/amdgpu: add chunk id validity check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index 7cd567b..86b78c7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -181,8 +181,6 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) + } + p->chunks[i].chunk_id = user_chunk.chunk_id; + p->chunks[i].length_dw = user_chunk.length_dw; +- if (p->chunks[i].chunk_id == AMDGPU_CHUNK_ID_IB) +- p->num_ibs++; + + size = p->chunks[i].length_dw; + cdata = (void __user *)(unsigned long)user_chunk.chunk_data; +@@ -199,7 +197,12 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) + goto out; + } + +- if (p->chunks[i].chunk_id == AMDGPU_CHUNK_ID_FENCE) { ++ switch (p->chunks[i].chunk_id) { ++ case AMDGPU_CHUNK_ID_IB: ++ p->num_ibs++; ++ break; ++ ++ case AMDGPU_CHUNK_ID_FENCE: + size = sizeof(struct drm_amdgpu_cs_chunk_fence); + if (p->chunks[i].length_dw * sizeof(uint32_t) >= size) { + uint32_t handle; +@@ -221,6 +224,11 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) + r = -EINVAL; + goto out; + } ++ break; ++ ++ default: ++ r = -EINVAL; ++ goto out; + } + } + +-- +1.9.1 + |