[asan] Fix asan initialization failure with newer (2.23+) glibc in use.
This patch tries to fix https://llvm.org/bugs/show_bug.cgi?id=27310 by using the same hack for malloc as we use for calloc: allocate corresponding memory from internal buffer when ASan is not initialized. This way we could avoid nasty '==6987==AddressSanitizer CHECK failed: ../../../../libsanitizer/asan/asan_rtl.cc:556 "((!asan_init_is_running && "ASan init calls itself!")) != (0)" (0x0, 0x0)' errors in environments with glibc 2.23+ in use, where _dl_signal_error, called from dlsym for undefined symbols calls malloc in order to get a buffer for error message. Differential Revision: http://reviews.llvm.org/D20235 llvm-svn: 269633
This commit is contained in:
parent
1aa231e3aa
commit
187043f61e
|
@ -26,52 +26,58 @@
|
||||||
// ---------------------- Replacement functions ---------------- {{{1
|
// ---------------------- Replacement functions ---------------- {{{1
|
||||||
using namespace __asan; // NOLINT
|
using namespace __asan; // NOLINT
|
||||||
|
|
||||||
static const uptr kCallocPoolSize = 1024;
|
static uptr allocated_for_dlsym;
|
||||||
static uptr calloc_memory_for_dlsym[kCallocPoolSize];
|
static const uptr kDlsymAllocPoolSize = 1024;
|
||||||
|
static uptr alloc_memory_for_dlsym[kDlsymAllocPoolSize];
|
||||||
|
|
||||||
static bool IsInCallocPool(const void *ptr) {
|
static bool IsInDlsymAllocPool(const void *ptr) {
|
||||||
sptr off = (sptr)ptr - (sptr)calloc_memory_for_dlsym;
|
uptr off = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
|
||||||
return 0 <= off && off < (sptr)kCallocPoolSize;
|
return off < sizeof(alloc_memory_for_dlsym);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void *AllocateFromLocalPool(uptr size_in_bytes) {
|
||||||
|
uptr size_in_words = RoundUpTo(size_in_bytes, kWordSize) / kWordSize;
|
||||||
|
void *mem = (void*)&alloc_memory_for_dlsym[allocated_for_dlsym];
|
||||||
|
allocated_for_dlsym += size_in_words;
|
||||||
|
CHECK_LT(allocated_for_dlsym, kDlsymAllocPoolSize);
|
||||||
|
return mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
INTERCEPTOR(void, free, void *ptr) {
|
INTERCEPTOR(void, free, void *ptr) {
|
||||||
GET_STACK_TRACE_FREE;
|
GET_STACK_TRACE_FREE;
|
||||||
if (UNLIKELY(IsInCallocPool(ptr)))
|
if (UNLIKELY(IsInDlsymAllocPool(ptr)))
|
||||||
return;
|
return;
|
||||||
asan_free(ptr, &stack, FROM_MALLOC);
|
asan_free(ptr, &stack, FROM_MALLOC);
|
||||||
}
|
}
|
||||||
|
|
||||||
INTERCEPTOR(void, cfree, void *ptr) {
|
INTERCEPTOR(void, cfree, void *ptr) {
|
||||||
GET_STACK_TRACE_FREE;
|
GET_STACK_TRACE_FREE;
|
||||||
if (UNLIKELY(IsInCallocPool(ptr)))
|
if (UNLIKELY(IsInDlsymAllocPool(ptr)))
|
||||||
return;
|
return;
|
||||||
asan_free(ptr, &stack, FROM_MALLOC);
|
asan_free(ptr, &stack, FROM_MALLOC);
|
||||||
}
|
}
|
||||||
|
|
||||||
INTERCEPTOR(void*, malloc, uptr size) {
|
INTERCEPTOR(void*, malloc, uptr size) {
|
||||||
|
if (UNLIKELY(!asan_inited))
|
||||||
|
// Hack: dlsym calls malloc before REAL(malloc) is retrieved from dlsym.
|
||||||
|
return AllocateFromLocalPool(size);
|
||||||
GET_STACK_TRACE_MALLOC;
|
GET_STACK_TRACE_MALLOC;
|
||||||
return asan_malloc(size, &stack);
|
return asan_malloc(size, &stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
INTERCEPTOR(void*, calloc, uptr nmemb, uptr size) {
|
INTERCEPTOR(void*, calloc, uptr nmemb, uptr size) {
|
||||||
if (UNLIKELY(!asan_inited)) {
|
if (UNLIKELY(!asan_inited))
|
||||||
// Hack: dlsym calls calloc before REAL(calloc) is retrieved from dlsym.
|
// Hack: dlsym calls calloc before REAL(calloc) is retrieved from dlsym.
|
||||||
static uptr allocated;
|
return AllocateFromLocalPool(nmemb * size);
|
||||||
uptr size_in_words = ((nmemb * size) + kWordSize - 1) / kWordSize;
|
|
||||||
void *mem = (void*)&calloc_memory_for_dlsym[allocated];
|
|
||||||
allocated += size_in_words;
|
|
||||||
CHECK(allocated < kCallocPoolSize);
|
|
||||||
return mem;
|
|
||||||
}
|
|
||||||
GET_STACK_TRACE_MALLOC;
|
GET_STACK_TRACE_MALLOC;
|
||||||
return asan_calloc(nmemb, size, &stack);
|
return asan_calloc(nmemb, size, &stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
INTERCEPTOR(void*, realloc, void *ptr, uptr size) {
|
INTERCEPTOR(void*, realloc, void *ptr, uptr size) {
|
||||||
GET_STACK_TRACE_MALLOC;
|
GET_STACK_TRACE_MALLOC;
|
||||||
if (UNLIKELY(IsInCallocPool(ptr))) {
|
if (UNLIKELY(IsInDlsymAllocPool(ptr))) {
|
||||||
uptr offset = (uptr)ptr - (uptr)calloc_memory_for_dlsym;
|
uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
|
||||||
uptr copy_size = Min(size, kCallocPoolSize - offset);
|
uptr copy_size = Min(size, kDlsymAllocPoolSize - offset);
|
||||||
void *new_ptr = asan_malloc(size, &stack);
|
void *new_ptr = asan_malloc(size, &stack);
|
||||||
internal_memcpy(new_ptr, ptr, copy_size);
|
internal_memcpy(new_ptr, ptr, copy_size);
|
||||||
return new_ptr;
|
return new_ptr;
|
||||||
|
|
Loading…
Reference in New Issue