Merge branch 'fix/heap-get-allocated-size_v4.4' into 'release/v4.4'

heap: Fix erroneous value returned by heap_caps_get_allocated_size() when poisoning is enabled (backport v4.4)

See merge request espressif/esp-idf!22189

components/heap/multi_heap_poisoning.c

@@ -349,7 +349,7 @@ multi_heap_handle_t multi_heap_register(void *start, size_t size)
     return multi_heap_register_impl(start, size);
 }
 
-static inline void subtract_poison_overhead(size_t *arg) {
+static inline __attribute__((always_inline)) void subtract_poison_overhead(size_t *arg) {
     if (*arg > POISON_OVERHEAD) {
         *arg -= POISON_OVERHEAD;
     } else {
@@ -362,6 +362,7 @@ size_t multi_heap_get_allocated_size(multi_heap_handle_t heap, void *p)
     poison_head_t *head = verify_allocated_region(p, true);
     assert(head != NULL);
     size_t result = multi_heap_get_allocated_size_impl(heap, head);
+    subtract_poison_overhead(&result);
     return result;
 }
 

components/heap/test/test_malloc.c

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 /*
  Generic test for malloc/free
 */
@@ -11,14 +16,13 @@
 #include "freertos/queue.h"
 #include "unity.h"
 #include "esp_heap_caps.h"
-
+#include "esp_heap_caps_init.h"
 #include "sdkconfig.h"
 
 
 static int **allocatedMem;
 static int noAllocated;
 
-
 static int tryAllocMem(void) {
     int i, j;
     const int allocateMaxK=1024*5; //try to allocate a max of 5MiB
@@ -154,3 +158,25 @@ TEST_CASE("malloc/calloc(0) should not call failure callback", "[heap]")
     TEST_ASSERT_NULL(ptr);
     TEST_ASSERT_FALSE(failure_occured);
 }
+
+TEST_CASE("test get allocated size", "[heap]")
+{
+    // random values to test, some are 4 bytes aligned, some are not
+    const size_t alloc_sizes[] = { 1035, 1064, 1541 };
+    const size_t iterations = sizeof(alloc_sizes) / sizeof(size_t);
+    void *ptr_array[iterations];
+
+    for (size_t i = 0; i < iterations; i++) {
+        ptr_array[i] = heap_caps_malloc(alloc_sizes[i], MALLOC_CAP_DEFAULT);
+        TEST_ASSERT_NOT_NULL(ptr_array[i]);
+
+        // test that the heap_caps_get_allocated_size() returns the right number of bytes (aligned to 4 bytes
+        // since the heap component aligns to 4 bytes)
+        const size_t aligned_size = (alloc_sizes[i] + 3) & ~3;
+        const size_t real_size = heap_caps_get_allocated_size(ptr_array[i]);
+        printf("initial size: %d, requested size : %d, allocated size: %d\n", alloc_sizes[i], aligned_size, real_size);
+        TEST_ASSERT_EQUAL(aligned_size, real_size);
+
+        heap_caps_free(ptr_array[i]);
+    }
+}