ASan support for the Zone

src/zone-inl.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 12 matching lines @@
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef V8_ZONE_INL_H_
 #define V8_ZONE_INL_H_
 
 #include "zone.h"
 
+#ifdef ADDRESS_SANITIZER
+#include <sanitizer/asan_interface.h>

[kcc1, 2014/03/26 06:43:41]

A style nit. I would do 
#ifdef ADDRESS_SANITIZER
# include <...>
#else
// define a few macros as empty
#endif

Then, instead of 
#ifdef ADDRESS_SANITIZER
ASAN_MACRO(...)
#endif

I would use 
  ASAN_MACRO(...)

This is just to make less ifdefs in the code. 
Otherwise looks good.
(I can't give a proper comment on the build file changes)

[Jakob Kummerow, 2014/03/26 09:59:12]

Good idea, done for ASAN_UNPOISON_MEMORY_REGION, keeping zone.cc free of
additional #ifdefs. For the changes in this file below, however, I don't think
pulling stuff out into a #define would improve readability.

+#endif
+
 #include "counters.h"
 #include "isolate.h"
 #include "utils.h"
 #include "v8-counters.h"
 
 namespace v8 {
 namespace internal {
 
 
+static const int kASanRedzoneBytes = 24;  // Must be a multiple of 8.
+
+
 inline void* Zone::New(int size) {
   // Round up the requested size to fit the alignment.
   size = RoundUp(size, kAlignment);
 
   // If the allocation size is divisible by 8 then we return an 8-byte aligned
   // address.
   if (kPointerSize == 4 && kAlignment == 4) {
     position_ += ((~size) & 4) & (reinterpret_cast<intptr_t>(position_) & 4);
   } else {
     ASSERT(kAlignment >= kPointerSize);
   }
 
   // Check if the requested size is available without expanding.
   Address result = position_;
 
-  if (size > limit_ - position_) {
-     result = NewExpand(size);
+  int size_with_redzone =
+#ifdef ADDRESS_SANITIZER
+      size + kASanRedzoneBytes;
+#else
+      size;
+#endif
+
+  if (size_with_redzone > limit_ - position_) {
+     result = NewExpand(size_with_redzone);
   } else {
-     position_ += size;
+     position_ += size_with_redzone;
   }
 
+#ifdef ADDRESS_SANITIZER
+  Address redzone_position = result + size;
+  ASSERT(redzone_position + kASanRedzoneBytes == position_);
+  ASAN_POISON_MEMORY_REGION(redzone_position, kASanRedzoneBytes);
+#endif
+
   // Check that the result has the proper alignment and return it.
   ASSERT(IsAddressAligned(result, kAlignment, 0));
   allocation_size_ += size;
   return reinterpret_cast<void*>(result);
 }
 
 
 template <typename T>
 T* Zone::NewArray(int length) {
+  CHECK(std::numeric_limits<int>::max() / static_cast<int>(sizeof(T)) > length);
   return static_cast<T*>(New(length * sizeof(T)));
 }
 
 
 bool Zone::excess_allocation() {
   return segment_bytes_allocated_ > kExcessLimit;
 }
 
 
 void Zone::adjust_segment_bytes_allocated(int delta) {
@@ skipping 29 matching lines @@
 
 template <typename T>
 void* ZoneSplayTree<T>::operator new(size_t size, Zone* zone) {
   return zone->New(static_cast<int>(size));
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_ZONE_INL_H_