maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ASan/Win] Fix issue 305 -- don't instrument .CRT initializer/terminator callbacks 

See https://code.google.com/p/address-sanitizer/issues/detail?id=305
Reviewed at http://reviews.llvm.org/D3607

llvm-svn: 207968
This commit is contained in:
Timur Iskhodzhanov 2014-05-05 14:28:38 +00:00
parent 9475117f5d
commit 9dbc206303
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
View File

@ -906,8 +906,8 @@ bool AddressSanitizerModule::ShouldInstrumentGlobal(GlobalVariable *G) {
// Ignore the globals from the __OBJC section. The ObjC runtime assumes // Ignore the globals from the __OBJC section. The ObjC runtime assumes
// those conform to /usr/lib/objc/runtime.h, so we can't add redzones to // those conform to /usr/lib/objc/runtime.h, so we can't add redzones to
// them. // them.
if ((Section.find("__OBJC,") == 0) || if (Section.startswith("__OBJC,") ||
(Section.find("__DATA, __objc_") == 0)) { Section.startswith("__DATA, __objc_")) {
DEBUG(dbgs() << "Ignoring ObjC runtime global: " << *G << "\n"); DEBUG(dbgs() << "Ignoring ObjC runtime global: " << *G << "\n");
return false; return false;
} }
@ -919,16 +919,26 @@ bool AddressSanitizerModule::ShouldInstrumentGlobal(GlobalVariable *G) {
// is placed into __DATA,__cfstring // is placed into __DATA,__cfstring
// Therefore there's no point in placing redzones into __DATA,__cfstring. // Therefore there's no point in placing redzones into __DATA,__cfstring.
// Moreover, it causes the linker to crash on OS X 10.7 // Moreover, it causes the linker to crash on OS X 10.7
if (Section.find("__DATA,__cfstring") == 0) { if (Section.startswith("__DATA,__cfstring")) {
DEBUG(dbgs() << "Ignoring CFString: " << *G << "\n"); DEBUG(dbgs() << "Ignoring CFString: " << *G << "\n");
return false; return false;
} }
// The linker merges the contents of cstring_literals and removes the // The linker merges the contents of cstring_literals and removes the
// trailing zeroes. // trailing zeroes.
if (Section.find("__TEXT,__cstring,cstring_literals") == 0) { if (Section.startswith("__TEXT,__cstring,cstring_literals")) {
DEBUG(dbgs() << "Ignoring a cstring literal: " << *G << "\n"); DEBUG(dbgs() << "Ignoring a cstring literal: " << *G << "\n");
return false; return false;
} }
// Callbacks put into the CRT initializer/terminator sections
// should not be instrumented.
// See https://code.google.com/p/address-sanitizer/issues/detail?id=305
// and http://msdn.microsoft.com/en-US/en-en/library/bb918180(v=vs.120).aspx
if (Section.startswith(".CRT")) {
DEBUG(dbgs() << "Ignoring a global initializer callback: " << *G << "\n");
return false;
}
// Globals from llvm.metadata aren't emitted, do not instrument them. // Globals from llvm.metadata aren't emitted, do not instrument them.
if (Section == "llvm.metadata") return false; if (Section == "llvm.metadata") return false;
} }