diff options
author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2018-01-11 22:53:30 +0000 |
---|---|---|
committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2018-01-11 22:53:30 +0000 |
commit | 9ebd4e4b00d76d6744709de26f9707723a96905c (patch) | |
tree | f4ed4b226390d1202d56a7c081354cdad28b376f /lib | |
parent | 37d0708903e4474aed7de5c2c600297f9e89402e (diff) |
[hwasan] Stack instrumentation.
Summary:
Very basic stack instrumentation using tagged pointers.
Tag for N'th alloca in a function is built as XOR of:
* base tag for the function, which is just some bits of SP (poor
man's random)
* small constant which is a function of N.
Allocas are aligned to 16 bytes. On every ReturnInst allocas are
re-tagged to catch use-after-return.
This implementation has a bunch of issues that will be taken care of
later:
1. lifetime intrinsics referring to tagged pointers are not
recognized in SDAG. This effectively disables stack coloring.
2. Generated code is quite inefficient. There is one extra
instruction at each memory access that adds the base tag to the
untagged alloca address. It would be better to keep tagged SP in a
callee-saved register and address allocas as an offset of that XOR
retag, but that needs better coordination between hwasan
instrumentation pass and prologue/epilogue insertion.
3. Lifetime instrinsics are ignored and use-after-scope is not
implemented. This would be harder to do than in ASan, because we
need to use a differently tagged pointer depending on which
lifetime.start / lifetime.end the current instruction is dominated
/ post-dominated.
Reviewers: kcc, alekseyshl
Subscribers: srhines, kubamracek, javed.absar, hiraditya, llvm-commits
Differential Revision: https://reviews.llvm.org/D41602
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@322324 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/hwasan/hwasan.cc | 4 | ||||
-rw-r--r-- | lib/hwasan/hwasan.h | 4 | ||||
-rw-r--r-- | lib/hwasan/hwasan_interceptors.cc | 9 | ||||
-rw-r--r-- | lib/hwasan/hwasan_interface_internal.h | 3 | ||||
-rw-r--r-- | lib/hwasan/hwasan_linux.cc | 23 |
5 files changed, 35 insertions, 8 deletions
diff --git a/lib/hwasan/hwasan.cc b/lib/hwasan/hwasan.cc index 8b1e5a784..b75e30d9e 100644 --- a/lib/hwasan/hwasan.cc +++ b/lib/hwasan/hwasan.cc @@ -359,6 +359,10 @@ void __hwasan_store16_noabort(uptr p) { CheckAddress<ErrorAction::Recover, AccessType::Store, 4>(p); } +void __hwasan_tag_memory(uptr p, u8 tag, uptr sz) { + TagMemoryAligned(p, sz, tag); +} + #if !SANITIZER_SUPPORTS_WEAK_HOOKS extern "C" { SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE diff --git a/lib/hwasan/hwasan.h b/lib/hwasan/hwasan.h index bcf5282dc..30fc947b6 100644 --- a/lib/hwasan/hwasan.h +++ b/lib/hwasan/hwasan.h @@ -40,7 +40,7 @@ const uptr kShadowAlignment = 1UL << kShadowScale; #define MEM_TO_SHADOW(mem) ((uptr)(mem) >> kShadowScale) #define SHADOW_TO_MEM(shadow) ((uptr)(shadow) << kShadowScale) -#define MEM_IS_APP(mem) true +#define MEM_IS_APP(mem) MemIsApp((uptr)(mem)) // TBI (Top Byte Ignore) feature of AArch64: bits [63:56] are ignored in address // translation and can be used to store a tag. @@ -69,6 +69,8 @@ extern int hwasan_inited; extern bool hwasan_init_is_running; extern int hwasan_report_count; +bool MemIsApp(uptr p); + bool ProtectRange(uptr beg, uptr end); bool InitShadow(); char *GetProcSelfMaps(); diff --git a/lib/hwasan/hwasan_interceptors.cc b/lib/hwasan/hwasan_interceptors.cc index fb39e9fda..2eeb42913 100644 --- a/lib/hwasan/hwasan_interceptors.cc +++ b/lib/hwasan/hwasan_interceptors.cc @@ -427,6 +427,15 @@ int OnExit() { *begin = *end = 0; \ } +#define COMMON_INTERCEPTOR_MEMSET_IMPL(ctx, dst, v, size) \ + { \ + COMMON_INTERCEPTOR_ENTER(ctx, memset, dst, v, size); \ + if (common_flags()->intercept_intrin && \ + MEM_IS_APP(GetAddressFromPointer(dst))) \ + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst, size); \ + return REAL(memset)(dst, v, size); \ + } + #include "sanitizer_common/sanitizer_platform_interceptors.h" #include "sanitizer_common/sanitizer_common_interceptors.inc" #include "sanitizer_common/sanitizer_signal_interceptors.inc" diff --git a/lib/hwasan/hwasan_interface_internal.h b/lib/hwasan/hwasan_interface_internal.h index 7e95271ac..67c150a27 100644 --- a/lib/hwasan/hwasan_interface_internal.h +++ b/lib/hwasan/hwasan_interface_internal.h @@ -83,6 +83,9 @@ void __hwasan_store8_noabort(uptr); SANITIZER_INTERFACE_ATTRIBUTE void __hwasan_store16_noabort(uptr); +SANITIZER_INTERFACE_ATTRIBUTE +void __hwasan_tag_memory(uptr p, u8 tag, uptr sz); + // Returns the offset of the first tag mismatch or -1 if the whole range is // good. SANITIZER_INTERFACE_ATTRIBUTE diff --git a/lib/hwasan/hwasan_linux.cc b/lib/hwasan/hwasan_linux.cc index 48dea8eb6..f660272c4 100644 --- a/lib/hwasan/hwasan_linux.cc +++ b/lib/hwasan/hwasan_linux.cc @@ -74,20 +74,24 @@ static void ProtectGap(uptr addr, uptr size) { Die(); } +// LowMem covers as much of the first 4GB as possible. +const uptr kLowMemEnd = 1UL<<32; +const uptr kLowShadowEnd = kLowMemEnd >> kShadowScale; +const uptr kLowShadowStart = kLowShadowEnd >> kShadowScale; +static uptr kHighShadowStart; +static uptr kHighShadowEnd; +static uptr kHighMemStart; + bool InitShadow() { const uptr maxVirtualAddress = GetMaxUserVirtualAddress(); - // LowMem covers as much of the first 4GB as possible. - const uptr kLowMemEnd = 1UL<<32; - const uptr kLowShadowEnd = kLowMemEnd >> kShadowScale; - const uptr kLowShadowStart = kLowShadowEnd >> kShadowScale; // HighMem covers the upper part of the address space. - const uptr kHighShadowEnd = (maxVirtualAddress >> kShadowScale) + 1; - const uptr kHighShadowStart = Max(kLowMemEnd, kHighShadowEnd >> kShadowScale); + kHighShadowEnd = (maxVirtualAddress >> kShadowScale) + 1; + kHighShadowStart = Max(kLowMemEnd, kHighShadowEnd >> kShadowScale); CHECK(kHighShadowStart < kHighShadowEnd); - const uptr kHighMemStart = kHighShadowStart << kShadowScale; + kHighMemStart = kHighShadowStart << kShadowScale; CHECK(kHighShadowEnd <= kHighMemStart); if (Verbosity()) { @@ -120,6 +124,11 @@ bool InitShadow() { return true; } +bool MemIsApp(uptr p) { + CHECK(GetTagFromPointer(p) == 0); + return p >= kHighMemStart || (p >= kLowShadowEnd && p < kLowMemEnd); +} + static void HwasanAtExit(void) { if (flags()->print_stats && (flags()->atexit || hwasan_report_count > 0)) ReportStats(); |