ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix buffer overflow in MutableDispatchWorkDim test (#2511)

Browse Source 
The test had critical buffer overflow issues:

1. Buffer size was calculated incorrectly: used update_elements (4)
instead
   of total work items. For 3D kernels, this meant allocating 16 bytes
   when 64*4=256 bytes were needed for the updated 4x4x4 grid.

2. Original 2x2x2 grid writes 8 elements (32 bytes) but buffer was only
   16 bytes, causing overflow on first execution.

3. Updated 4x4x4 grid writes 64 elements (256 bytes) with massive
   overflow into adjacent memory.

4. Verify function only checked one dimension instead of total elements
   in the 3D grid.

Fixed by:
- Calculating total work items as product of all dimensions
- Using update_total_elements (64) for buffer allocation
- Updating Verify calls to check correct number of elements
- Adding constants for original_total_elements and update_total_elements
This commit is contained in:
Yilong Guo
2025-09-09 23:53:13 +08:00
committed by GitHub
parent 4fc861358e
commit 3f6dd3c333
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_work_dim.cpp
View File

@@ -36,7 +36,7 @@ struct MutableDispatchWorkDim : public InfoMutableCommandBufferTest
cl_int SetUp(int elements) override cl_int SetUp(int elements) override
{ {
result_data.resize(update_elements); result_data.resize(update_total_elements);
return InfoMutableCommandBufferTest::SetUp(elements); return InfoMutableCommandBufferTest::SetUp(elements);
} }
@@ -53,7 +53,7 @@ struct MutableDispatchWorkDim : public InfoMutableCommandBufferTest
return !mutable_support || InfoMutableCommandBufferTest::Skip(); return !mutable_support || InfoMutableCommandBufferTest::Skip();
} }
bool Verify(cl_mem buffer, cl_uint gid_elements) bool Verify(cl_mem buffer, cl_uint expected_value, size_t total_elements)
{ {
std::memset(result_data.data(), 0, alloc_size); std::memset(result_data.data(), 0, alloc_size);
cl_int error = cl_int error =
@@ -61,13 +61,13 @@ struct MutableDispatchWorkDim : public InfoMutableCommandBufferTest
result_data.data(), 0, nullptr, nullptr); result_data.data(), 0, nullptr, nullptr);
test_error(error, "clEnqueueReadBuffer failed"); test_error(error, "clEnqueueReadBuffer failed");
for (size_t i = 0; i < gid_elements; i++) for (size_t i = 0; i < total_elements; i++)
{ {
if (result_data[i] != gid_elements) if (result_data[i] != expected_value)
{ {
log_error("Data failed to verify at index %zu. " log_error("Data failed to verify at index %zu. "
"Expected %u, result was %u\n", "Expected %u, result was %u\n",
i, gid_elements, result_data[i]); i, expected_value, result_data[i]);
return false; return false;
} }
} }
@@ -134,15 +134,15 @@ struct MutableDispatchWorkDim : public InfoMutableCommandBufferTest
test_error(error, "clFinish failed."); test_error(error, "clFinish failed.");
// Verify results before any update // Verify results before any update
if (!Verify(stream1, global_size_3D[0])) if (!Verify(stream1, global_size_3D[0], original_total_elements))
{ {
return TEST_FAIL; return TEST_FAIL;
} }
if (!Verify(stream2, global_size_3D[1])) if (!Verify(stream2, global_size_3D[1], original_total_elements))
{ {
return TEST_FAIL; return TEST_FAIL;
} }
if (!Verify(stream3, global_size_3D[2])) if (!Verify(stream3, global_size_3D[2], original_total_elements))
{ {
return TEST_FAIL; return TEST_FAIL;
} }
@@ -178,15 +178,15 @@ struct MutableDispatchWorkDim : public InfoMutableCommandBufferTest
test_error(error, "clEnqueueCommandBufferKHR failed"); test_error(error, "clEnqueueCommandBufferKHR failed");
// Verify update is reflected in buffer output. // Verify update is reflected in buffer output.
if (!Verify(stream1, update_global_size_3D[0])) if (!Verify(stream1, update_global_size_3D[0], update_total_elements))
{ {
return TEST_FAIL; return TEST_FAIL;
} }
if (!Verify(stream2, update_global_size_3D[1])) if (!Verify(stream2, update_global_size_3D[1], update_total_elements))
{ {
return TEST_FAIL; return TEST_FAIL;
} }
if (!Verify(stream3, update_global_size_3D[2])) if (!Verify(stream3, update_global_size_3D[2], update_total_elements))
{ {
return TEST_FAIL; return TEST_FAIL;
} }
@@ -205,8 +205,13 @@ struct MutableDispatchWorkDim : public InfoMutableCommandBufferTest
static constexpr std::array<size_t, work_dim> update_global_size_3D = { static constexpr std::array<size_t, work_dim> update_global_size_3D = {
update_elements, update_elements, update_elements update_elements, update_elements, update_elements
}; };
// Size in bytes of each of the 3 cl_mem buffers // Total number of work items in original and updated grids
static const size_t alloc_size = update_elements * sizeof(cl_uint); static const size_t original_total_elements =
original_elements * original_elements * original_elements;
static const size_t update_total_elements =
update_elements * update_elements * update_elements;
// Size in bytes of each of the 3 cl_mem buffers (using the larger size)
static const size_t alloc_size = update_total_elements * sizeof(cl_uint);
cl_mutable_command_khr command = nullptr; cl_mutable_command_khr command = nullptr;
std::vector<cl_uint> result_data; std::vector<cl_uint> result_data;