Fix for handling incorrect patchSize in patchWithRequiredSize

This fix adds additional size control to patched memory

Related-To: NEO-7760
Signed-off-by: Andrzej Koska <[email protected]>

Author: andrzejkoska

opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp

@@ -689,7 +689,7 @@ HWTEST_F(EnqueueHandlerTest, givenKernelUsingSyncBufferWhenEnqueuingKernelThenSs
 
     {
         MockKernelWithInternals kernelInternals{*pClDevice, context};
-        kernelInternals.kernelInfo.setSyncBuffer(sizeof(uint8_t), 0, 0);
+        kernelInternals.kernelInfo.setSyncBuffer(sizeof(uint32_t), 0, 0);
         constexpr auto bindingTableOffset = sizeof(RENDER_SURFACE_STATE);
         kernelInternals.kernelInfo.setBindingTable(bindingTableOffset, 1);
         kernelInternals.kernelInfo.heapInfo.SurfaceStateHeapSize = sizeof(RENDER_SURFACE_STATE) + sizeof(BINDING_TABLE_STATE);

opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp

@@ -88,7 +88,7 @@ class SyncBufferHandlerTest : public SyncBufferEnqueueHandlerTest {
     }
 
     void patchAllocateSyncBuffer() {
-        kernelInternals->kernelInfo.setSyncBuffer(sizeof(uint8_t), 0, 0);
+        kernelInternals->kernelInfo.setSyncBuffer(sizeof(uint32_t), 0, 0);
     }
 
     MockSyncBufferHandler *getSyncBufferHandler() {

shared/source/helpers/ptr_math.h

@@ -1,11 +1,13 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+#include "shared/source/helpers/debug_helpers.h"
+
 #include <cstddef>
 #include <cstdint>
 
@@ -58,9 +60,11 @@ inline void patchWithRequiredSize(void *memoryToBePatched, uint32_t patchSize, u
     if (patchSize == sizeof(uint64_t)) {
         uint64_t *curbeAddress = reinterpret_cast<uint64_t *>(memoryToBePatched);
         PatchStoreOperation{}(curbeAddress, patchValue);
-    } else {
+    } else if (patchSize == sizeof(uint32_t)) {
         uint32_t *curbeAddress = reinterpret_cast<uint32_t *>(memoryToBePatched);
         PatchStoreOperation{}(curbeAddress, static_cast<uint32_t>(patchValue));
+    } else {
+        UNRECOVERABLE_IF(patchSize != 0);
     }
 }
 

shared/test/unit_test/helpers/ptr_math_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -53,6 +53,17 @@ TEST(PtrMath, givenCastToUint64FunctionWhenConstPointerIsPassedItIsCalledThenPro
     EXPECT_EQ(uintAddress, expectedUint64Address);
 }
 
+TEST(PtrMath, givenPatchWithRequiredSizeFunctionThenProperMemoryToBePatchedIsSet) {
+    uint64_t memoryToBePatched = 0;
+    patchWithRequiredSize(&memoryToBePatched, 8, 0xaaaaaaaaaaaaaaaa);
+    EXPECT_EQ(memoryToBePatched, 0xaaaaaaaaaaaaaaaa);
+    patchWithRequiredSize(&memoryToBePatched, 4, 0xbbbbbbbbbbbbbbbb);
+    EXPECT_EQ(memoryToBePatched, 0xaaaaaaaabbbbbbbb);
+    patchWithRequiredSize(&memoryToBePatched, 0, 0xcccccccccccccccc);
+    EXPECT_EQ(memoryToBePatched, 0xaaaaaaaabbbbbbbb);
+    EXPECT_THROW(patchWithRequiredSize(&memoryToBePatched, 1, 0xcccccccccccccccc), std::exception);
+}
+
 TEST(ptrOffset, WhenGettingPtrOffsetThen64BitIsPreserved) {
     uint64_t ptrBefore = 0x800000000;
     size_t offset = 0x1234;