[hwasan] Untag destination address in hwasan_posix_memalign.
authorEvgenii Stepanov <eugenis@google.com>
Fri, 8 May 2020 23:29:46 +0000 (16:29 -0700)
committerEvgenii Stepanov <eugenis@google.com>
Fri, 8 May 2020 23:35:48 +0000 (16:35 -0700)
Required on X86 because no TBI.

compiler-rt/lib/hwasan/hwasan_allocator.cpp

index 81a57d3..1d82db0 100644 (file)
@@ -363,7 +363,7 @@ int hwasan_posix_memalign(void **memptr, uptr alignment, uptr size,
     // OOM error is already taken care of by HwasanAllocate.
     return errno_ENOMEM;
   CHECK(IsAligned((uptr)ptr, alignment));
-  *memptr = ptr;
+  *(void **)UntagPtr(memptr) = ptr;
   return 0;
 }