diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2852-drm-amdgpu-Fix-potential-integer-overflows.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2852-drm-amdgpu-Fix-potential-integer-overflows.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2852-drm-amdgpu-Fix-potential-integer-overflows.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2852-drm-amdgpu-Fix-potential-integer-overflows.patch new file mode 100644 index 00000000..de09e6f0 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2852-drm-amdgpu-Fix-potential-integer-overflows.patch @@ -0,0 +1,49 @@ +From f3a53e52797456c119f5ff42ae77947ee38375fd Mon Sep 17 00:00:00 2001 +From: Felix Kuehling <Felix.Kuehling@amd.com> +Date: Tue, 9 Jul 2019 19:31:21 -0400 +Subject: [PATCH 2852/2940] drm/amdgpu: Fix potential integer overflows + +With mm_nodes larger than 4GB, byte_count in amdgpu_fill_buffer would +overflow. + +Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index 386edf718103..24996da3a6ee 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -2380,9 +2380,9 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, + mm_node = bo->tbo.mem.mm_node; + num_loops = 0; + while (num_pages) { +- uint32_t byte_count = mm_node->size << PAGE_SHIFT; ++ uint64_t byte_count = mm_node->size << PAGE_SHIFT; + +- num_loops += DIV_ROUND_UP(byte_count, max_bytes); ++ num_loops += DIV_ROUND_UP_ULL(byte_count, max_bytes); + num_pages -= mm_node->size; + ++mm_node; + } +@@ -2408,12 +2408,13 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, + mm_node = bo->tbo.mem.mm_node; + + while (num_pages) { +- uint32_t byte_count = mm_node->size << PAGE_SHIFT; ++ uint64_t byte_count = mm_node->size << PAGE_SHIFT; + uint64_t dst_addr; + + dst_addr = amdgpu_mm_node_addr(&bo->tbo, mm_node, &bo->tbo.mem); + while (byte_count) { +- uint32_t cur_size_in_bytes = min(byte_count, max_bytes); ++ uint32_t cur_size_in_bytes = min_t(uint64_t, byte_count, ++ max_bytes); + + amdgpu_emit_fill_buffer(adev, &job->ibs[0], src_data, + dst_addr, cur_size_in_bytes); +-- +2.17.1 + |