eal/arm64: support ASan

[dpdk.git] / lib / eal / common / rte_malloc.c

diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
index 9d39e58..d0bec26 100644 (file)
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -162,6 +162,8 @@ rte_calloc(const char *type, size_t num, size_t size, unsigned align)
 void *
 rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
 {
+       size_t user_size;
+
        if (ptr == NULL)
                return rte_malloc_socket(NULL, size, align, socket);
 
@@ -171,6 +173,8 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
                return NULL;
        }
 
+       user_size = size;
+
        size = RTE_CACHE_LINE_ROUNDUP(size), align = RTE_CACHE_LINE_ROUNDUP(align);
 
        /* check requested socket id and alignment matches first, and if ok,
@@ -181,6 +185,9 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
                        RTE_PTR_ALIGN(ptr, align) == ptr &&
                        malloc_heap_resize(elem, size) == 0) {
                rte_eal_trace_mem_realloc(size, align, socket, ptr);
+
+               asan_set_redzone(elem, user_size);
+
                return ptr;
        }
 
@@ -192,7 +199,7 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)
        if (new_ptr == NULL)
                return NULL;
        /* elem: |pad|data_elem|data|trailer| */
-       const size_t old_size = elem->size - elem->pad - MALLOC_ELEM_OVERHEAD;
+       const size_t old_size = old_malloc_size(elem);
        rte_memcpy(new_ptr, ptr, old_size < size ? old_size : size);
        rte_free(ptr);