diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2018-01-13 01:32:15 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2018-01-13 01:32:15 +0000 |
| commit | 456e800a8f8f3a495af810bef705f5fed5a5ceb9 (patch) | |
| tree | fc412f2f6bdb662b949cbfa5b5bed062347144d2 | |
| parent | 428d40eb6fab0ec14419f6867520a84b5730e320 (diff) | |
[hwasan] An LLVM flag to disable stack tag randomization.
Summary: Necessary to achieve consistent test results.
Reviewers: kcc, alekseyshl
Subscribers: kubamracek, llvm-commits, hiraditya
Differential Revision: https://reviews.llvm.org/D42023
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@322429 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/hwasan/hwasan.cc | 8 | ||||
| -rw-r--r-- | lib/hwasan/hwasan_interface_internal.h | 3 | ||||
| -rw-r--r-- | test/hwasan/lit.cfg | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/lib/hwasan/hwasan.cc b/lib/hwasan/hwasan.cc index b75e30d9e..f565e7858 100644 --- a/lib/hwasan/hwasan.cc +++ b/lib/hwasan/hwasan.cc @@ -363,6 +363,14 @@ void __hwasan_tag_memory(uptr p, u8 tag, uptr sz) { TagMemoryAligned(p, sz, tag); } +static const u8 kFallbackTag = 0xBB; + +u8 __hwasan_generate_tag() { + HwasanThread *t = GetCurrentThread(); + if (!t) return kFallbackTag; + return t->GenerateRandomTag(); +} + #if !SANITIZER_SUPPORTS_WEAK_HOOKS extern "C" { SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE diff --git a/lib/hwasan/hwasan_interface_internal.h b/lib/hwasan/hwasan_interface_internal.h index 67c150a27..b065099fb 100644 --- a/lib/hwasan/hwasan_interface_internal.h +++ b/lib/hwasan/hwasan_interface_internal.h @@ -86,6 +86,9 @@ void __hwasan_store16_noabort(uptr); SANITIZER_INTERFACE_ATTRIBUTE void __hwasan_tag_memory(uptr p, u8 tag, uptr sz); +SANITIZER_INTERFACE_ATTRIBUTE +u8 __hwasan_generate_tag(); + // Returns the offset of the first tag mismatch or -1 if the whole range is // good. SANITIZER_INTERFACE_ATTRIBUTE diff --git a/test/hwasan/lit.cfg b/test/hwasan/lit.cfg index 07e11f75e..3ebba51d0 100644 --- a/test/hwasan/lit.cfg +++ b/test/hwasan/lit.cfg @@ -9,7 +9,7 @@ config.name = 'HWAddressSanitizer' + getattr(config, 'name_suffix', 'default') config.test_source_root = os.path.dirname(__file__) # Setup default compiler flags used with -fsanitize=memory option. -clang_hwasan_cflags = ["-fsanitize=hwaddress", config.target_cflags] + config.debug_info_flags +clang_hwasan_cflags = ["-fsanitize=hwaddress", "-mllvm", "-hwasan-generate-tags-with-calls", config.target_cflags] + config.debug_info_flags clang_hwasan_cxxflags = config.cxx_mode_flags + clang_hwasan_cflags def build_invocation(compile_flags): |