Merge branch 'fix/patch-heap-rom-integrity-check' into 'master'

fix(heap): Patch tlsf_check_pool in ROM heap

See merge request espressif/esp-idf!26615

components/heap/Kconfig

@@ -128,4 +128,14 @@ menu "Heap memory debugging"
 
             Note that it is only safe to enable this configuration if no functions from esp_heap_caps.h
             or esp_heap_trace.h are called from ISR.
+
+    config HEAP_TLSF_CHECK_PATCH
+        bool "Patch the tlsf_check_pool() for ROM HEAP TLSF implementation"
+        depends on IDF_TARGET_ESP32C2 && ESP32C2_REV_MIN_FULL < 200
+        default y
+        help
+            ROM does not contain the patch of tlsf_check_pool() allowing perform
+            the integrity checking on used blocks. The patch to allow  such check
+            needs to be applied.
+
 endmenu

components/heap/test_apps/heap_tests/main/test_corruption_check.c

@@ -70,8 +70,6 @@ TEST_CASE("multi_heap poisoning detection", "[heap]")
     }
 }
 
-#if !defined(CONFIG_HEAP_TLSF_USE_ROM_IMPL)
-
 #ifdef CONFIG_HEAP_TASK_TRACKING
 #define HEAD_CANARY_OFFSET  3 // head canary | task tracking | allocated size
 #else
@@ -117,6 +115,4 @@ TEST_CASE("canary corruption in light or comprehensive poisoning mode", "[heap]"
     ptr[TAIL_CANARY_OFFSET] = canary;
     heap_caps_free(ptr);
 }
-
-#endif // !CONFIG_HEAP_TLSF_USE_ROM_IMPL
 #endif // CONFIG_HEAP_POISONING_LIGHT && CONFIG_HEAP_LIGHT_POISONING