[PATCH] D33784: Bug 33206 - Sanitizer CHECK failed: ((allocated_for_dlsym)) < ((kDlsymAllocPoolSize)) (1036, 1024)) with preload

[Denis Khalikov via Phabricator via llvm-commits]

denis13 updated this revision to Diff 101776.
denis13 added a comment.

Test was added


https://reviews.llvm.org/D33784

Files:
  lib/asan/asan_malloc_linux.cc
  test/asan/TestCases/Linux/asan_preload_test-3.cc


Index: test/asan/TestCases/Linux/asan_preload_test-3.cc
===================================================================
--- /dev/null
+++ test/asan/TestCases/Linux/asan_preload_test-3.cc
@@ -0,0 +1,23 @@
+// Regression test for PR33206
+//
+// RUN: %clang -DDYN=1 -fPIC -shared %s -o %t-dso1.so
+// RUN: %clang -DDYN=1 -fPIC -shared %s -o %t-dso2.so %t-dso1.so
+// RUN: %clang %s -o %t %t-dso2.so
+// RUN: env LD_PRELOAD=%shared_libasan %run %t 2>&1 | FileCheck %s
+// REQUIRES: asan-dynamic-runtime
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifdef DYN
+__attribute__((constructor)) void foo() {
+  void *p = malloc(1 << 20);
+  free(p);
+}
+#else
+int main() {
+  // CHECK: Success
+  printf("Success\n");
+  return 0;
+}
+#endif
Index: lib/asan/asan_malloc_linux.cc
===================================================================
--- lib/asan/asan_malloc_linux.cc
+++ lib/asan/asan_malloc_linux.cc
@@ -60,17 +60,21 @@
 #endif // SANITIZER_INTERCEPT_CFREE
 
 INTERCEPTOR(void*, malloc, uptr size) {
-  if (UNLIKELY(!asan_inited))
-    // Hack: dlsym calls malloc before REAL(malloc) is retrieved from dlsym.
+  if (UNLIKELY(asan_init_is_running))
+    // Hack: dlsym calls malloc before REAL(malloc) is retrieved from dlsym
     return AllocateFromLocalPool(size);
+  if (UNLIKELY(!asan_inited))
+    AsanInitFromRtl();
   GET_STACK_TRACE_MALLOC;
   return asan_malloc(size, &stack);
 }
 
 INTERCEPTOR(void*, calloc, uptr nmemb, uptr size) {
-  if (UNLIKELY(!asan_inited))
+  if (UNLIKELY(asan_init_is_running))
     // Hack: dlsym calls calloc before REAL(calloc) is retrieved from dlsym.
     return AllocateFromLocalPool(nmemb * size);
+  if (UNLIKELY(!asan_inited))
+    AsanInitFromRtl();
   GET_STACK_TRACE_MALLOC;
   return asan_calloc(nmemb, size, &stack);
 }
@@ -78,18 +82,21 @@
 INTERCEPTOR(void*, realloc, void *ptr, uptr size) {
   GET_STACK_TRACE_MALLOC;
   if (UNLIKELY(IsInDlsymAllocPool(ptr))) {
-    uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
-    uptr copy_size = Min(size, kDlsymAllocPoolSize - offset);
+    const uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
+    const uptr copy_size = Min(size, kDlsymAllocPoolSize - offset);
     void *new_ptr;
-    if (UNLIKELY(!asan_inited)) {
+    if (UNLIKELY(asan_init_is_running)) {
       new_ptr = AllocateFromLocalPool(size);
     } else {
-      copy_size = size;
-      new_ptr = asan_malloc(copy_size, &stack);
+      if (UNLIKELY(!asan_inited))
+        AsanInitFromRtl();
+      new_ptr = asan_malloc(size, &stack);
     }
     internal_memcpy(new_ptr, ptr, copy_size);
     return new_ptr;
   }
+  if (UNLIKELY(!asan_inited))
+    AsanInitFromRtl();
   return asan_realloc(ptr, size, &stack);
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D33784.101776.patch
Type: text/x-patch
Size: 2707 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170607/abd4920e/attachment.bin>