From: Maxim Ostapenko <m.ostapenko@partner.samsung.com>
Date: Mon, 26 Sep 2016 08:11:21 +0000 (+0000)
Subject: Fix reallocation logic when IsInDlsymAllocPool(ptr) is true.
X-Git-Tag: archive/raspbian/1%3.9.1-19+rpi1^2^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e494eea00078fdad4245cf5bcd36bdb806653984;p=llvm-toolchain-3.9.git

Fix reallocation logic when IsInDlsymAllocPool(ptr) is true.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@282389 91177308-0d34-0410-b5e6-96231b3b80d8

Gbp-Pq: Name upstream-asan-msan-fix-reallocation-logic.diff
---

diff --git a/compiler-rt/lib/asan/asan_malloc_linux.cc b/compiler-rt/lib/asan/asan_malloc_linux.cc
index d7a22d68..a78767c1 100644
--- a/compiler-rt/lib/asan/asan_malloc_linux.cc
+++ b/compiler-rt/lib/asan/asan_malloc_linux.cc
@@ -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;
   }
diff --git a/compiler-rt/lib/msan/msan_interceptors.cc b/compiler-rt/lib/msan/msan_interceptors.cc
index 2aeaef49..93b93aec 100644
--- a/compiler-rt/lib/msan/msan_interceptors.cc
+++ b/compiler-rt/lib/msan/msan_interceptors.cc
@@ -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;
   }