From f326d7dfb080c1f02f44957b4f491b333b8a3adb Mon Sep 17 00:00:00 2001 From: Francis Ricci Date: Tue, 18 Jul 2017 23:51:44 +0000 Subject: Revert "Only scan global sections containing data in LSan on darwin" This reverts commit 7e46d78d47832f03ce42adcf56417fbfd47cbaad. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@308394 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/lsan/lsan_common_mac.cc | 15 ++++----------- lib/sanitizer_common/sanitizer_common.cc | 5 ++--- lib/sanitizer_common/sanitizer_common.h | 12 +++--------- lib/sanitizer_common/sanitizer_procmaps.h | 1 - lib/sanitizer_common/sanitizer_procmaps_mac.cc | 6 ++---- 5 files changed, 11 insertions(+), 28 deletions(-) (limited to 'lib') diff --git a/lib/lsan/lsan_common_mac.cc b/lib/lsan/lsan_common_mac.cc index 147e62d1f..ade94340a 100644 --- a/lib/lsan/lsan_common_mac.cc +++ b/lib/lsan/lsan_common_mac.cc @@ -92,15 +92,8 @@ LoadedModule *GetLinker() { return nullptr; } // required on Darwin. void InitializePlatformSpecificModules() {} -// Sections which may contain global variables -static const char *kGlobalVarSecNames[] = { - "__DATA", "__bss", "__common", "__data", - "__objc_data", "__objc_opt_rw", "__objc_opt_ptrs"}; - // Scans global variables for heap pointers. void ProcessGlobalRegions(Frontier *frontier) { - for (auto name : kGlobalVarSecNames) CHECK(ARRAY_SIZE(name) < kMaxSegName); - MemoryMappingLayout memory_mapping(false); InternalMmapVector modules(/*initial_capacity*/ 128); memory_mapping.DumpListOfModules(&modules); @@ -111,10 +104,10 @@ void ProcessGlobalRegions(Frontier *frontier) { for (const __sanitizer::LoadedModule::AddressRange &range : modules[i].ranges()) { - for (auto name : kGlobalVarSecNames) { - if (!internal_strcmp(range.name, name)) - ScanGlobalRange(range.beg, range.end, frontier); - } + // Sections storing global variables are writable and non-executable + if (range.executable || !range.writable) continue; + + ScanGlobalRange(range.beg, range.end, frontier); } } } diff --git a/lib/sanitizer_common/sanitizer_common.cc b/lib/sanitizer_common/sanitizer_common.cc index 3868d5469..7e6f8fce7 100644 --- a/lib/sanitizer_common/sanitizer_common.cc +++ b/lib/sanitizer_common/sanitizer_common.cc @@ -285,10 +285,9 @@ void LoadedModule::clear() { } void LoadedModule::addAddressRange(uptr beg, uptr end, bool executable, - bool writable, const char *name) { + bool writable) { void *mem = InternalAlloc(sizeof(AddressRange)); - AddressRange *r = - new(mem) AddressRange(beg, end, executable, writable, name); + AddressRange *r = new(mem) AddressRange(beg, end, executable, writable); ranges_.push_back(r); if (executable && end > max_executable_address_) max_executable_address_ = end; diff --git a/lib/sanitizer_common/sanitizer_common.h b/lib/sanitizer_common/sanitizer_common.h index f684271d4..89aae5798 100644 --- a/lib/sanitizer_common/sanitizer_common.h +++ b/lib/sanitizer_common/sanitizer_common.h @@ -702,7 +702,6 @@ inline const char *ModuleArchToString(ModuleArch arch) { } const uptr kModuleUUIDSize = 16; -const uptr kMaxSegName = 16; // Represents a binary loaded into virtual memory (e.g. this can be an // executable or a shared object). @@ -721,8 +720,7 @@ class LoadedModule { void set(const char *module_name, uptr base_address, ModuleArch arch, u8 uuid[kModuleUUIDSize], bool instrumented); void clear(); - void addAddressRange(uptr beg, uptr end, bool executable, bool writable, - const char *name = nullptr); + void addAddressRange(uptr beg, uptr end, bool executable, bool writable); bool containsAddress(uptr address) const; const char *full_name() const { return full_name_; } @@ -738,17 +736,13 @@ class LoadedModule { uptr end; bool executable; bool writable; - char name[kMaxSegName]; - AddressRange(uptr beg, uptr end, bool executable, bool writable, - const char *name) + AddressRange(uptr beg, uptr end, bool executable, bool writable) : next(nullptr), beg(beg), end(end), executable(executable), - writable(writable) { - internal_strncpy(this->name, (name ? name : ""), ARRAY_SIZE(this->name)); - } + writable(writable) {} }; const IntrusiveList &ranges() const { return ranges_; } diff --git a/lib/sanitizer_common/sanitizer_procmaps.h b/lib/sanitizer_common/sanitizer_procmaps.h index 50753c4e6..76685661c 100644 --- a/lib/sanitizer_common/sanitizer_procmaps.h +++ b/lib/sanitizer_common/sanitizer_procmaps.h @@ -58,7 +58,6 @@ class MemoryMappedSegment { u8 uuid[kModuleUUIDSize]; #if SANITIZER_MAC - char name[kMaxSegName]; private: friend class MemoryMappingLayout; diff --git a/lib/sanitizer_common/sanitizer_procmaps_mac.cc b/lib/sanitizer_common/sanitizer_procmaps_mac.cc index 277d2b194..411bbd39d 100644 --- a/lib/sanitizer_common/sanitizer_procmaps_mac.cc +++ b/lib/sanitizer_common/sanitizer_procmaps_mac.cc @@ -42,13 +42,12 @@ void MemoryMappedSegment::NextSectionLoad(LoadedModule *module) { uptr sec_start = sc->addr + base_virt_addr_; uptr sec_end = sec_start + sc->size; - module->addAddressRange(sec_start, sec_end, IsExecutable(), IsWritable(), - sc->sectname); + module->addAddressRange(sec_start, sec_end, IsExecutable(), IsWritable()); } void MemoryMappedSegment::AddAddressRanges(LoadedModule *module) { if (!nsects_) { - module->addAddressRange(start, end, IsExecutable(), IsWritable(), name); + module->addAddressRange(start, end, IsExecutable(), IsWritable()); return; } @@ -200,7 +199,6 @@ bool MemoryMappingLayout::NextSegmentLoad(MemoryMappedSegment *segment) { : _dyld_get_image_name(current_image_); internal_strncpy(segment->filename, src, segment->filename_size); } - internal_strncpy(segment->name, sc->segname, ARRAY_SIZE(segment->name)); segment->arch = current_arch_; internal_memcpy(segment->uuid, current_uuid_, kModuleUUIDSize); return true; -- cgit v1.2.3