diff options
author | Alexey Samsonov <samsonov@google.com> | 2012-06-06 16:15:07 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2012-06-06 16:15:07 +0000 |
commit | a25b3463477d2a825df4f656001fc07c594b35ac (patch) | |
tree | 15ae5c6a5dae8377f0da8ea945f9745c16ae1b67 /lib/asan/asan_linux.cc | |
parent | 8c53e54ef9e713953ec9495e82e5c330b96e49f3 (diff) | |
download | compiler-rt-a25b3463477d2a825df4f656001fc07c594b35ac.tar.gz compiler-rt-a25b3463477d2a825df4f656001fc07c594b35ac.tar.bz2 compiler-rt-a25b3463477d2a825df4f656001fc07c594b35ac.tar.xz |
[Sanitizer] Switch to common mmap/munmap routines in ASan run-time.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@158078 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_linux.cc')
-rw-r--r-- | lib/asan/asan_linux.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc index 7661b8c0..b59a0a51 100644 --- a/lib/asan/asan_linux.cc +++ b/lib/asan/asan_linux.cc @@ -74,17 +74,6 @@ bool AsanInterceptsSignal(int signum) { return signum == SIGSEGV && FLAG_handle_segv; } -void *AsanMmapSomewhereOrDie(uptr size, const char *mem_type) { - size = RoundUpTo(size, kPageSize); - void *res = internal_mmap(0, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANON, -1, 0); - if (res == (void*)-1) { - OutOfMemoryMessageAndDie(mem_type, size); - } - return res; -} - void *AsanMmapFixedNoReserve(uptr fixed_addr, uptr size) { return internal_mmap((void*)fixed_addr, size, PROT_READ | PROT_WRITE, @@ -99,15 +88,6 @@ void *AsanMprotect(uptr fixed_addr, uptr size) { 0, 0); } -void AsanUnmapOrDie(void *addr, uptr size) { - if (!addr || !size) return; - int res = internal_munmap(addr, size); - if (res != 0) { - Report("Failed to unmap\n"); - Die(); - } -} - // Like getenv, but reads env directly from /proc and does not use libc. // This function should be called first inside __asan_init. const char* AsanGetEnv(const char* name) { @@ -146,7 +126,7 @@ AsanProcMaps::AsanProcMaps() { } AsanProcMaps::~AsanProcMaps() { - AsanUnmapOrDie(proc_self_maps_buff_, proc_self_maps_buff_mmaped_size_); + UnmapOrDie(proc_self_maps_buff_, proc_self_maps_buff_mmaped_size_); } void AsanProcMaps::Reset() { |