[asan] suppress new-delete-type-mismatch per ASAN_OPTIONS suppressions settings

[sberg]

I had asked previously about this topic at http://lists.llvm.org/pipermail/cfe-dev/2016-June/049387.html "[cfe-dev] ASan: suppress new-delete-type-mismatch via ASAN_OPTIONS suppressions?" but got no answer there, so thought I'd go ahead with a patch.

[kcc]

adding more reviewers as I'll be OOO.

In general, I don't mind, but see my comments.

test/asan/TestCases/allocator-suppressions.cc

1

this test may need to be moved to test/asan/TestCases/Linux
or simply be made part of test/asan/TestCases/Linux/new_delete_mismatch.cc
There were problems with new-delete mismatch on other platforms due to ]
different interception mechanisms.

Also, a better test would have to bugs, one suppressed and one not.
Otherwise we may miss a bug where a suppression will match any stack trace.

4

the bug type prefix should clearly be different (new_delete_type_mismatch or some such)

[sberg]

test/asan/TestCases/allocator-suppressions.cc

4

what do you mean with "bug type prefix"?

[kcc]

test/asan/TestCases/allocator-suppressions.cc

4

every suppression entry has a suppression type followed by the wildcard
http://clang.llvm.org/docs/SanitizerSpecialCaseList.html#format

What you are trying to do is clearly unrelated to "interceptor_via_fun" suppression type

[sberg]

(Please also see the question about documentation I had raised at http://lists.llvm.org/pipermail/cfe-dev/2016-June/049648.html.)

test/asan/TestCases/allocator-suppressions.cc

4

I'd assumed ASan's operator new/delete interception could be considered interception, too, so the existing interceptor_via_{fun,src} would fit. So we'd need a pair of new_delete_type_mismatch_via_{fun,src} suppression types?

[kcc]

Looking at it more carefully I think it should look like

src:/my/path/*=new_delete_type_mismatch
fun:foo*=new_delete_type_mismatch

lib/asan/asan_allocator.cc

 //
 //===----------------------------------------------------------------------===//
 
 #include "asan_allocator.h"
 #include "asan_mapping.h"
 #include "asan_poisoning.h"
 #include "asan_report.h"
 #include "asan_stack.h"
+#include "asan_suppressions.h"
 #include "asan_thread.h"
 #include "sanitizer_common/sanitizer_allocator_interface.h"
 #include "sanitizer_common/sanitizer_flags.h"
 #include "sanitizer_common/sanitizer_internal_defs.h"
 #include "sanitizer_common/sanitizer_list.h"
 #include "sanitizer_common/sanitizer_stackdepot.h"
 #include "sanitizer_common/sanitizer_quarantine.h"
 #include "lsan/lsan_common.h"
if (m->alloc_type != alloc_type) {
       if (atomic_load(&alloc_dealloc_mismatch, memory_order_acquire)) {
         ReportAllocTypeMismatch((uptr)ptr, stack, (AllocType)m->alloc_type,
                                 (AllocType)alloc_type);
       }
     }
 
     if (delete_size && flags()->new_delete_type_mismatch &&
         delete_size != m->UsedSize()) {
+      if (!IsStackTraceSuppressed(stack)) {
         ReportNewDeleteSizeMismatch(p, m->UsedSize(), delete_size, stack);
       }
+    }
 
     QuarantineChunk(m, ptr, stack, alloc_type);
   }
 
   void *Reallocate(void *old_ptr, uptr new_size, BufferedStackTrace *stack) {
     CHECK(old_ptr && new_size);
     uptr p = reinterpret_cast<uptr>(old_ptr);
     uptr chunk_beg = p - kChunkHeaderSize;

test/asan/TestCases/allocator-suppressions.cc

+// Check that without suppressions, we catch the issue.
+// RUN: %clangxx_asan -fsized-deallocation %s -o %t
+// RUN: not %run %t 2>&1 | FileCheck --check-prefix=CHECK-FAIL %s
+// RUN: echo "interceptor_via_fun:fail_function" > %t.supp
+// RUN: %env_asan_opts=suppressions='"%t.supp"' %run %t 2>&1 | FileCheck --allow-empty --check-prefix=CHECK-IGNORE %s
+
+struct Base {
+  char a[10];
+};
+
+struct Derived: Base {
+  char b[10];
+};
+
+void fail_function(Base *p) {
+  delete p;
+}
+
+int main() {
+  fail_function(new Derived);
+}
+
+// CHECK-FAIL: AddressSanitizer: new-delete-type-mismatch
+// CHECK-IGNORE-NOT: AddressSanitizer: new-delete-type-mismatch