replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[asan, msan] Fix reallocation logic when IsInDlsymAllocPool(ptr) is true. 

llvm-svn: 282389
This commit is contained in:
Maxim Ostapenko 2016-09-26 08:11:21 +00:00
parent bd80bbd3c3
commit b3cf42ce56
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler-rt/lib/asan/asan_malloc_linux.cc
View File

@ -79,10 +79,12 @@ INTERCEPTOR(void*, realloc, void *ptr, uptr size) {
uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
uptr copy_size = Min(size, kDlsymAllocPoolSize - offset);
void *new_ptr;
if (UNLIKELY(!asan_inited))
if (UNLIKELY(!asan_inited)) {
new_ptr = AllocateFromLocalPool(size);
else
new_ptr = asan_malloc(size, &stack);
} else {
copy_size = size;
new_ptr = asan_malloc(copy_size, &stack);
}
internal_memcpy(new_ptr, ptr, copy_size);
return new_ptr;
}

8
compiler-rt/lib/msan/msan_interceptors.cc
View File

@ -935,7 +935,13 @@ INTERCEPTOR(void *, realloc, void *ptr, SIZE_T size) {
if (UNLIKELY(IsInDlsymAllocPool(ptr))) {
uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
uptr copy_size = Min(size, kDlsymAllocPoolSize - offset);
void *new_ptr = AllocateFromLocalPool(size);
void *new_ptr;
if (UNLIKELY(!msan_inited)) {
new_ptr = AllocateFromLocalPool(copy_size);
} else {
copy_size = size;
new_ptr = MsanReallocate(&stack, ptr, copy_size, sizeof(u64), false);
}
internal_memcpy(new_ptr, ptr, copy_size);
return new_ptr;
}