diff options
| author | Kostya Serebryany <kcc@google.com> | 2016-04-22 20:05:52 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2016-04-22 20:05:52 +0000 |
| commit | 7575ed5f5244615b1e2dfcee45ff965565dd6c97 (patch) | |
| tree | 3e070dab953064b2fc29b8018ad445167eebe669 /lib | |
| parent | d61a344b362af7f0ab9461f04bb03915ef189818 (diff) | |
[sanitizer] allow zero first parameter in MmapNoAccess; This is a part of r267094 that has been reverted
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@267203 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_posix_libcdep.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_posix_libcdep.cc b/lib/sanitizer_common/sanitizer_posix_libcdep.cc index 6c1a85239..20aed194e 100644 --- a/lib/sanitizer_common/sanitizer_posix_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_posix_libcdep.cc @@ -272,7 +272,8 @@ void *MmapFixedNoReserve(uptr fixed_addr, uptr size, const char *name) { void *MmapNoAccess(uptr fixed_addr, uptr size, const char *name) { int fd = name ? GetNamedMappingFd(name, size) : -1; - unsigned flags = MAP_PRIVATE | MAP_FIXED | MAP_NORESERVE; + unsigned flags = MAP_PRIVATE | MAP_NORESERVE; + if (fixed_addr != 0) flags |= MAP_FIXED; if (fd == -1) flags |= MAP_ANON; return (void *)internal_mmap((void *)fixed_addr, size, PROT_NONE, flags, fd, |