mem: poison memory when freed
RFC v2 1/1 mem: poison memory when freed
DPDK malloc library allows broken programs to work because the semantics of zmalloc and malloc are the same.
This patch enables a more secure model which will catch (and crash) programs that reuse memory already freed if RTE_MALLOC_DEBUG is enabled.
---
v2
- keep original behavior unless RTE_MALLOC_DEBUG is enabled.
lib/librte_eal/common/malloc_elem.c | 17 ++++++++++++++--- lib/librte_eal/common/rte_malloc.c | 8 +++++++- 2 files changed, 21 insertions(+), 4 deletions(-)
lib/librte_eal/common/malloc_elem.c +14 -3
@@ -23,6 +23,16 @@#include "malloc_elem.h" #include "malloc_heap.h" +/* If debugging is enabled, freed memory is set to poison value +* to catch buggy programs. Otherwise, freed memory is zerod +* to avoid having to zero in zmalloc +*/ +#ifdef RTE_MALLOC_DEBUG +#define MALLOC_POISON 0x6b +#else +#define MALLOC_POISON 0 +#endif +size_t malloc_elem_find_max_iova_contig (struct malloc_elem *elem,size_t align) {
@@ -476,7 +486,7 @@ malloc_elem_join_adjacent_free(struct malloc_elem *elem)join_elem (elem, elem->next);/* erase header, trailer and pad */ -memset (erase,0 , erase_len); +memset (erase,MALLOC_POISON , erase_len); }/*
@@ -500,7 +510,7 @@ malloc_elem_join_adjacent_free(struct malloc_elem *elem)join_elem (new_elem, elem);/* erase header, trailer and pad */ -memset (erase,0 , erase_len); +memset (erase,MALLOC_POISON , erase_len); elem = new_elem; }
@@ -531,7 +541,8 @@ malloc_elem_free(struct malloc_elem *elem)/* decrease heap's count of allocated elements */ elem->heap->alloc_count--; -memset (ptr,0 , data_len); +/* poison memory */ +memset (ptr,MALLOC_POISON , data_len);return elem; }
lib/librte_eal/common/rte_malloc.c +7 -1
@@ -70,7 +70,13 @@ rte_malloc(const char *type, size_t size, unsigned align)void *rte_zmalloc_socket (const char *type,size_t size,unsigned align,int socket) { -return rte_malloc_socket (type, size, align, socket); +void *ptr =rte_malloc_socket (type, size, align, socket); + +#ifndef RTE_MALLOC_DEBUG +if (ptr !=NULL ) +memset (ptr,0 , size); +#endif +return ptr; }/*
Signature · 1 line
2.18.0
Quoted 8 lines · Stephen Hemminger
DPDK malloc library allows broken programs to work because the semantics of zmalloc and malloc are the same.
This patch enables a more secure model which will catch (and crash) programs that reuse memory already freed if
RTE_MALLOC_DEBUGis enabled.Signed-off-by Stephen Hemminger <[email protected]>
I like the idea, so
Quoted 71 lines · Stephen Hemminger
DPDK malloc library allows broken programs to work because the semantics of zmalloc and malloc are the same.
This patch enables a more secure model which will catch (and crash) programs that reuse memory already freed if
RTE_MALLOC_DEBUGis enabled.Signed-off-by Stephen Hemminger <[email protected]>---
v2
- keep original behavior unlessRTE_MALLOC_DEBUGis enabled.lib/librte_eal/common/malloc_elem.c | 17 ++++++++++++++--- lib/librte_eal/common/rte_malloc.c | 8 +++++++- 2 files changed, 21 insertions(+), 4 deletions(-)lib/librte_eal/common/malloc_elem.c +14
-3@@ -23,6 +23,16 @@#include "malloc_elem.h" #include "malloc_heap.h" +/* If debugging is enabled, freed memory is set to poison value +* to catch buggy programs. Otherwise, freed memory is zerod +* to avoid having to zero in zmalloc +*/ +#ifdef RTE_MALLOC_DEBUG +#define MALLOC_POISON 0x6b +#else +#define MALLOC_POISON 0 +#endif +size_t malloc_elem_find_max_iova_contig (struct malloc_elem *elem,size_t align) {@@ -476,7 +486,7 @@ malloc_elem_join_adjacent_free(struct malloc_elem *elem)join_elem (elem, elem->next);/* erase header, trailer and pad */ -memset (erase,0 , erase_len); +memset (erase,MALLOC_POISON , erase_len); }/* @@ -500,7 +510,7 @@ malloc_elem_join_adjacent_free(struct malloc_elem *elem)join_elem (new_elem, elem);/* erase header, trailer and pad */ -memset (erase,0 , erase_len); +memset (erase,MALLOC_POISON , erase_len); elem = new_elem; }@@ -531,7 +541,8 @@ malloc_elem_free(struct malloc_elem *elem)/* decrease heap's count of allocated elements */ elem->heap->alloc_count--; -memset (ptr,0 , data_len); +/* poison memory */ +memset (ptr,MALLOC_POISON , data_len);return elem; }lib/librte_eal/common/rte_malloc.c +0
-0
lib/librte_eal/common/rte_malloc.c rte_malloc(const char *type, size_t size, unsigned align) · line 75
Quoted 7 lines
lib/librte_eal/common/rte_malloc.c +3
-1@@ -70,7 +70,13 @@ rte_malloc(const char *type, size_t size, unsigned align)void *rte_zmalloc_socket (const char *type,size_t size,unsigned align,int socket) { -return rte_malloc_socket (type, size, align, socket); +void *ptr =rte_malloc_socket (type, size, align, socket); + +#ifndef RTE_MALLOC_DEBUG
It should be #ifdef above.
Quoted 7 lines
lib/librte_eal/common/rte_malloc.c +4
-0+if (ptr !=NULL ) +memset (ptr,0 , size); +#endif +return ptr; }/*
Quoted 9 lines · Stephen Hemminger
DPDK malloc library allows broken programs to work because the semantics of zmalloc and malloc are the same.
This patch enables a more secure model which will catch (and crash) programs that reuse memory already freed if
RTE_MALLOC_DEBUGis enabled.Signed-off-by Stephen Hemminger <[email protected]>---
Making it not default behavior makes it suitable for inclusion without deprecation notices IMO.
Signature · 2 lines
Thanks, Anatoly