mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

After-merge fix for ASAN and MSAN

Browse source 
The merge commit 0fd89a1a89
of commit b6ec1e8bbf
seems to cause occasional MemorySanitizer failures,
because it failed to replace some MEM_UNDEFINED() calls
with MEM_MAKE_ADDRESSABLE().

my_large_free(): Correctly invoke MEM_MAKE_ADDRESSABLE() after
freeing memory. Failure to do so could cause bogus
AddressSanitizer failures for memory allocated by my_large_malloc().
On MemorySanitizer, we will do nothing.

buf_pool_t::chunk_t::create(): Replace the MEM_MAKE_ADDRESSABLE()
that had been added in commit 484931325e
to work around the issue.
This commit is contained in:
Marko Mäkelä 2020-07-05 16:25:29 +03:00
parent 90d5d90640
commit ab4069909d
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mysys/my_largepage.c
View file

@ -421,9 +421,11 @@ void my_large_free(void *ptr, size_t size)
{
my_error(EE_BADMEMORYRELEASE, MYF(ME_ERROR_LOG_ONLY), ptr, size, errno);
}
# if !__has_feature(memory_sanitizer)
else
{
MEM_UNDEFINED(ptr, size);
MEM_MAKE_ADDRESSABLE(ptr, size);
# endif
}
#elif defined(_WIN32)
/*
@ -435,9 +437,11 @@ void my_large_free(void *ptr, size_t size)
my_error(EE_BADMEMORYRELEASE, MYF(ME_ERROR_LOG_ONLY), ptr, size,
GetLastError());
}
# if !__has_feature(memory_sanitizer)
else
{
MEM_UNDEFINED(ptr, size);
MEM_MAKE_ADDRESSABLE(ptr, size);
# endif
}
#else
my_free_lock(ptr);

2
storage/innobase/buf/buf0buf.cc
View file

@ -1356,7 +1356,7 @@ inline bool buf_pool_t::chunk_t::create(size_t bytes)
if (UNIV_UNLIKELY(!mem))
return false;
MEM_MAKE_ADDRESSABLE(mem, mem_size());
MEM_UNDEFINED(mem, mem_size());
#ifdef HAVE_LIBNUMA
if (srv_numa_interleave)