diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2018-11-28 13:25:43 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-05-20 18:18:23 +0200 |
| commit | 7b59ec6f345986db0cbc6f8b1d504a6e7e21cb5f (patch) | |
| tree | 3596af6e2ebd502982e1835030306c7d38931699 | |
| parent | 2c9844a438c5f0bddcb037a1e05978118f48abb6 (diff) | |
| download | mariadb-git-7b59ec6f345986db0cbc6f8b1d504a6e7e21cb5f.tar.gz | |
MDEV-17799 Add ASAN-poisoned redzones for MEM_ROOT and mem_heap_t
This patch is for MEM_ROOT only.
In debug mode add 8 byte of poisoned memory before every allocated chunk.
On the right of every chunk there will be either 1-7 trailing poisoned bytes, or
next chunk's redzone, or poisoned non allocated memory or redzone of a
malloc()ed buffer.
| -rw-r--r-- | include/my_valgrind.h | 7 | ||||
| -rw-r--r-- | mysys/my_alloc.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/my_valgrind.h b/include/my_valgrind.h index 6df8f5a772e..14db2af2cb3 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -13,6 +13,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#ifndef _my_valgrind_h +#define _my_valgrind_h + /* clang -> gcc */ #ifndef __has_feature # define __has_feature(x) 0 @@ -49,9 +52,13 @@ https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning */ #endif /* HAVE_VALGRIND */ #ifndef DBUG_OFF +static const size_t REDZONE_SIZE= 8; #define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B); MEM_UNDEFINED(A, trash_tmp); memset(A, C, trash_tmp); } while (0) #else +static const size_t REDZONE_SIZE= 0; #define TRASH_FILL(A,B,C) do { MEM_UNDEFINED((A), (B)); } while (0) #endif #define TRASH_ALLOC(A,B) do { TRASH_FILL(A,B,0xA5); MEM_UNDEFINED(A,B); } while(0) #define TRASH_FREE(A,B) do { TRASH_FILL(A,B,0x8F); MEM_NOACCESS(A,B); } while(0) + +#endif /* _my_valgrind_h */ diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 15b96e8a20a..9e5b6809dea 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -197,7 +197,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) DBUG_SET("-d,simulate_out_of_memory"); DBUG_RETURN((void*) 0); /* purecov: inspected */ }); - length= ALIGN_SIZE(length); + length= ALIGN_SIZE(length) + REDZONE_SIZE; if ((*(prev= &mem_root->free)) != NULL) { if ((*prev)->left < length && @@ -242,6 +242,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) mem_root->used= next; mem_root->first_block_usage= 0; } + point+= REDZONE_SIZE; TRASH_ALLOC(point, original_length); DBUG_PRINT("exit",("ptr: 0x%lx", (ulong) point)); DBUG_RETURN((void*) point); |