Loading...
--- dyld/dyld-421.2/src/ImageLoaderMachOClassic.cpp
+++ dyld/dyld-239.3/src/ImageLoaderMachOClassic.cpp
@@ -55,7 +55,7 @@
#include "mach-o/dyld_images.h"
// in dyldStartup.s
-extern "C" void stub_binding_helper_i386_old();
+extern "C" void fast_stub_binding_helper_interface();
#if __x86_64__
@@ -97,8 +97,7 @@
// for PIE record end of program, to know where to start loading dylibs
if ( slide != 0 )
fgNextPIEDylibAddress = (uintptr_t)image->getEnd();
-
- image->disableCoverageCheck();
+
image->instantiateFinish(context);
image->setMapped(context);
@@ -127,7 +126,7 @@
}
// create image by mapping in a mach-o file
-ImageLoaderMachOClassic* ImageLoaderMachOClassic::instantiateFromFile(const char* path, int fd, const uint8_t* fileData, size_t lenFileData,
+ImageLoaderMachOClassic* ImageLoaderMachOClassic::instantiateFromFile(const char* path, int fd, const uint8_t* fileData,
uint64_t offsetInFat, uint64_t lenInFat, const struct stat& info,
unsigned int segCount, unsigned int libCount,
const struct linkedit_data_command* codeSigCmd, const LinkContext& context)
@@ -140,9 +139,6 @@
// if this image is code signed, let kernel validate signature before mapping any pages from image
image->loadCodeSignature(codeSigCmd, fd, offsetInFat, context);
- // Validate that first data we read with pread actually matches with code signature
- image->validateFirstPages(codeSigCmd, fd, fileData, lenFileData, offsetInFat, context);
-
// mmap segments
image->mapSegmentsClassic(fd, offsetInFat, lenInFat, info.st_size, context);
@@ -196,7 +192,6 @@
// remember this is from shared cache and cannot be unloaded
image->fInSharedCache = true;
image->setNeverUnload();
- image->disableCoverageCheck();
// segments already mapped in cache
if ( context.verboseMapping ) {
@@ -235,8 +230,6 @@
// for compatibility, never unload dylibs loaded from memory
image->setNeverUnload();
- image->disableCoverageCheck();
-
// bundle loads need path copied
if ( moduleName != NULL )
image->setPath(moduleName);
@@ -280,7 +273,7 @@
void ImageLoaderMachOClassic::instantiateFinish(const LinkContext& context)
{
// now that segments are mapped in, get real fMachOData, fLinkEditBase, and fSlide
- this->parseLoadCmds(context);
+ this->parseLoadCmds();
}
ImageLoaderMachOClassic::~ImageLoaderMachOClassic()
@@ -359,11 +352,11 @@
end += fSymbolTable[fDynamicInfo->iextdefsym+fDynamicInfo->nextdefsym-1].n_un.n_strx;
// round to whole pages
- start = dyld_page_trunc(start);
- end = dyld_page_round(end);
+ start = start & (-4096);
+ end = (end + 4095) & (-4096);
// skip if there is only one page
- if ( (end-start) > dyld_page_size ) {
+ if ( (end-start) > 4096 ) {
madvise((void*)start, end-start, MADV_WILLNEED);
fgTotalBytesPreFetched += (end-start);
if ( context.verboseMapping ) {
@@ -442,8 +435,8 @@
if ( 0 != r ) {
// no room here, deallocate what has succeeded so far
for(unsigned int j=0; j < i; ++j) {
- addr = nextAltLoadAddress + regions[j].sfm_address - regions[0].sfm_address;
- size = regions[j].sfm_size ;
+ vm_address_t addr = nextAltLoadAddress + regions[j].sfm_address - regions[0].sfm_address;
+ vm_size_t size = regions[j].sfm_size ;
(void)vm_deallocate(mach_task_self(), addr, size);
}
nextAltLoadAddress += 0x00100000; // skip ahead 1MB and try again
@@ -626,7 +619,7 @@
const char* lastSlash = strrchr(childInstallPath, '/');
if ( lastSlash != NULL ) {
const char* firstDot = strchr(lastSlash, '.');
- size_t len;
+ int len;
if ( firstDot == NULL )
len = strlen(lastSlash);
else
@@ -757,9 +750,10 @@
-void ImageLoaderMachOClassic::rebase(const LinkContext& context, uintptr_t slide)
+void ImageLoaderMachOClassic::rebase(const LinkContext& context)
{
CRSetCrashLogMessage2(this->getPath());
+ register const uintptr_t slide = this->fSlide;
const uintptr_t relocBase = this->getRelocBase();
// prefetch any LINKEDIT pages needed
@@ -932,7 +926,7 @@
}
-const ImageLoader::Symbol* ImageLoaderMachOClassic::findShallowExportedSymbol(const char* name, const ImageLoader** foundIn) const
+const ImageLoader::Symbol* ImageLoaderMachOClassic::findExportedSymbol(const char* name, const ImageLoader** foundIn) const
{
const struct macho_nlist* sym = NULL;
if ( fDynamicInfo->tocoff == 0 )
@@ -1042,7 +1036,7 @@
}
uintptr_t ImageLoaderMachOClassic::resolveUndefined(const LinkContext& context, const struct macho_nlist* undefinedSymbol,
- bool twoLevel, bool dontCoalesce, bool runResolver, const ImageLoader** foundIn)
+ bool twoLevel, bool dontCoalesce, const ImageLoader** foundIn)
{
++fgTotalBindSymbolsResolved;
const char* symbolName = &fStrings[undefinedSymbol->n_un.n_strx];
@@ -1068,7 +1062,7 @@
// if a bundle is loaded privately the above will not find its exports
if ( this->isBundle() && this->hasHiddenExports() ) {
// look in self for needed symbol
- sym = this->findShallowExportedSymbol(symbolName, foundIn);
+ sym = this->findExportedSymbol(symbolName, foundIn);
if ( sym != NULL )
return (*foundIn)->getExportedSymbolAddress(sym, context, this);
}
@@ -1077,7 +1071,7 @@
// if reference is weak_import, then it is ok, just return 0
return 0;
}
- throwSymbolNotFound(context, symbolName, this->getPath(), "", "flat namespace");
+ throwSymbolNotFound(context, symbolName, this->getPath(), "flat namespace");
}
else {
// symbol requires searching images with coalesced symbols (not done during prebinding)
@@ -1122,7 +1116,7 @@
if ( context.flatExportFinder(symbolName, &sym, foundIn) )
return (*foundIn)->getExportedSymbolAddress(sym, context, this);
- throwSymbolNotFound(context, symbolName, this->getPath(), "", "dynamic lookup");
+ throwSymbolNotFound(context, symbolName, this->getPath(), "dynamic lookup");
}
else if ( ord <= libraryCount() ) {
target = libImage(ord-1);
@@ -1140,12 +1134,12 @@
//dyld::log("resolveUndefined(%s) in %s\n", symbolName, this->getPath());
throw "symbol not found";
}
-
- uintptr_t address;
- if ( target->findExportedSymbolAddress(context, symbolName, this, ord, runResolver, foundIn, &address) )
- return address;
-
- if ( (undefinedSymbol->n_type & N_PEXT) != 0 ) {
+
+ const Symbol* sym = target->findExportedSymbol(symbolName, true, foundIn);
+ if ( sym!= NULL ) {
+ return (*foundIn)->getExportedSymbolAddress(sym, context, this);
+ }
+ else if ( (undefinedSymbol->n_type & N_PEXT) != 0 ) {
// don't know why the static linker did not eliminate the internal reference to a private extern definition
*foundIn = this;
return this->getSymbolAddress(undefinedSymbol, context, false);
@@ -1156,7 +1150,7 @@
}
// nowhere to be found
- throwSymbolNotFound(context, symbolName, this->getPath(), "", target->getPath());
+ throwSymbolNotFound(context, symbolName, this->getPath(), target->getPath());
}
}
@@ -1268,7 +1262,7 @@
// range of global symbols. To handle that case we do the coalesing now.
dontCoalesce = false;
}
- symbolAddr = this->resolveUndefined(context, undefinedSymbol, twoLevel, dontCoalesce, false, &image);
+ symbolAddr = this->resolveUndefined(context, undefinedSymbol, twoLevel, dontCoalesce, &image);
lastUndefinedSymbol = undefinedSymbol;
symbolAddrCached = false;
}
@@ -1408,11 +1402,11 @@
const uint8_t type = sect->flags & SECTION_TYPE;
uint32_t symbolIndex = INDIRECT_SYMBOL_LOCAL;
if ( type == S_LAZY_SYMBOL_POINTERS ) {
- const size_t pointerCount = sect->size / sizeof(uintptr_t);
+ const uint32_t pointerCount = sect->size / sizeof(uintptr_t);
uintptr_t* const symbolPointers = (uintptr_t*)(sect->addr + fSlide);
if ( (lazyPointer >= symbolPointers) && (lazyPointer < &symbolPointers[pointerCount]) ) {
const uint32_t indirectTableOffset = sect->reserved1;
- const size_t lazyIndex = lazyPointer - symbolPointers;
+ const uint32_t lazyIndex = lazyPointer - symbolPointers;
symbolIndex = indirectTable[indirectTableOffset + lazyIndex];
}
}
@@ -1434,7 +1428,7 @@
if ( symbolIndex != INDIRECT_SYMBOL_ABS && symbolIndex != INDIRECT_SYMBOL_LOCAL ) {
const char* symbolName = &fStrings[fSymbolTable[symbolIndex].n_un.n_strx];
const ImageLoader* image = NULL;
- uintptr_t symbolAddr = this->resolveUndefined(context, &fSymbolTable[symbolIndex], twoLevel, false, true, &image);
+ uintptr_t symbolAddr = this->resolveUndefined(context, &fSymbolTable[symbolIndex], twoLevel, false, &image);
symbolAddr = this->bindIndirectSymbol(lazyPointer, sect, symbolName, symbolAddr, image, context);
++fgTotalLazyBindFixups;
return symbolAddr;
@@ -1450,7 +1444,7 @@
-void ImageLoaderMachOClassic::initializeCoalIterator(CoalIterator& it, unsigned int loadOrder, unsigned)
+void ImageLoaderMachOClassic::initializeCoalIterator(CoalIterator& it, unsigned int loadOrder)
{
it.image = this;
it.symbolName = " ";
@@ -1525,7 +1519,7 @@
symbol_index = toc[it.curIndex-1].symbol_index;
}
else {
- symbol_index = fDynamicInfo->iextdefsym + (uint32_t)it.curIndex - 1;
+ symbol_index = fDynamicInfo->iextdefsym+it.curIndex-1;
}
const struct macho_nlist* sym = &fSymbolTable[symbol_index];
//dyld::log("getAddressCoalIterator() => 0x%llX, %s symbol_index=%d, in %s\n", (uint64_t)(sym->n_value + fSlide), &fStrings[sym->n_un.n_strx], symbol_index, this->getPath());
@@ -1541,7 +1535,7 @@
}
-void ImageLoaderMachOClassic::updateUsesCoalIterator(CoalIterator& it, uintptr_t value, ImageLoader* targetImage, unsigned targetIndex, const LinkContext& context)
+void ImageLoaderMachOClassic::updateUsesCoalIterator(CoalIterator& it, uintptr_t value, ImageLoader* targetImage, const LinkContext& context)
{
// flat_namespace images with classic LINKEDIT do not need late coalescing.
// They still need to be iterated becuase they may implement
@@ -1560,7 +1554,7 @@
symbol_index = toc[it.curIndex-1].symbol_index;
}
else {
- symbol_index = fDynamicInfo->iextdefsym + (uint32_t)it.curIndex - 1;
+ symbol_index = fDynamicInfo->iextdefsym+it.curIndex-1;
}
// if this image's copy of the symbol is not a weak definition nor a weak reference then nothing to coalesce here
@@ -1643,7 +1637,7 @@
if ( reloc->r_pcrel )
type = BIND_TYPE_TEXT_PCREL32;
#endif
- this->bindLocation(context, (uintptr_t)location, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ");
+ this->bindLocation(context, (uintptr_t)location, value, targetImage, type, symbolName, addend, "weak ");
boundSomething = true;
}
}
@@ -1670,11 +1664,11 @@
case S_NON_LAZY_SYMBOL_POINTERS:
case S_LAZY_SYMBOL_POINTERS:
{
- size_t elementCount = sect->size / elementSize;
+ uint32_t elementCount = sect->size / elementSize;
const uint32_t indirectTableOffset = sect->reserved1;
uint8_t* ptrToBind = (uint8_t*)(sect->addr + fSlide);
//dyld::log(" scanning section %s of %s starting at %p\n", sect->sectname, this->getShortName(), ptrToBind);
- for (size_t j=0; j < elementCount; ++j, ptrToBind += elementSize) {
+ for (uint32_t j=0; j < elementCount; ++j, ptrToBind += elementSize) {
if ( indirectTable[indirectTableOffset + j] == symbol_index ) {
//dyld::log(" found symbol index match at %d/%d, ptrToBind=%p\n", j, elementCount, ptrToBind);
// update pointer
@@ -1717,7 +1711,7 @@
bool isLazySymbol = false;
const uint8_t type = sect->flags & SECTION_TYPE;
uint32_t elementSize = sizeof(uintptr_t);
- size_t elementCount = sect->size / elementSize;
+ uint32_t elementCount = sect->size / elementSize;
if ( type == S_NON_LAZY_SYMBOL_POINTERS ) {
if ( ! bindNonLazys )
continue;
@@ -1745,7 +1739,7 @@
}
const uint32_t indirectTableOffset = sect->reserved1;
uint8_t* ptrToBind = (uint8_t*)(sect->addr + fSlide);
- for (size_t j=0; j < elementCount; ++j, ptrToBind += elementSize) {
+ for (uint32_t j=0; j < elementCount; ++j, ptrToBind += elementSize) {
#if LINKEDIT_USAGE_DEBUG
noteAccessedLinkEditAddress(&indirectTable[indirectTableOffset + j]);
#endif
@@ -1797,7 +1791,7 @@
// range of global symbols. To handle that case we do the coalesing now.
dontCoalesce = false;
}
- uintptr_t symbolAddr = resolveUndefined(context, sym, twoLevel, dontCoalesce, false, &image);
+ uintptr_t symbolAddr = resolveUndefined(context, sym, twoLevel, dontCoalesce, &image);
// update pointer
symbolAddr = this->bindIndirectSymbol((uintptr_t*)ptrToBind, sect, &fStrings[sym->n_un.n_strx], symbolAddr, image, context);
// update stats
@@ -1838,7 +1832,7 @@
const uint32_t* const indirectTable = (uint32_t*)&fLinkEditBase[fDynamicInfo->indirectsymoff];
uint8_t* start = (uint8_t*)(sect->addr + this->fSlide);
uint8_t* end = start + sect->size;
- uintptr_t dyldHandler = (uintptr_t)&stub_binding_helper_i386_old;
+ uintptr_t dyldHandler = (uintptr_t)&fast_stub_binding_helper_interface;
uint32_t entryIndex = 0;
for (uint8_t* entry = start; entry < end; entry += 5, ++entryIndex) {
bool installLazyHandler = true;
@@ -1852,7 +1846,7 @@
const char* symbolName = &fStrings[fSymbolTable[symbolIndex].n_un.n_strx];
const ImageLoader* image = NULL;
try {
- uintptr_t symbolAddr = this->resolveUndefined(context, &fSymbolTable[symbolIndex], this->usesTwoLevelNameSpace(), false, false, &image);
+ uintptr_t symbolAddr = this->resolveUndefined(context, &fSymbolTable[symbolIndex], this->usesTwoLevelNameSpace(), false, &image);
symbolAddr = this->bindIndirectSymbol((uintptr_t*)entry, sect, symbolName, symbolAddr, image, context);
++fgTotalBindFixups;
uint32_t rel32 = symbolAddr - (((uint32_t)entry)+5);
@@ -1956,12 +1950,19 @@
for (const struct macho_section* sect=sectionsStart; sect < sectionsEnd; ++sect) {
const uint8_t type = sect->flags & SECTION_TYPE;
if ( (type == S_NON_LAZY_SYMBOL_POINTERS) || (type == S_LAZY_SYMBOL_POINTERS) ) {
- const size_t pointerCount = sect->size / sizeof(uintptr_t);
+ const uint32_t pointerCount = sect->size / sizeof(uintptr_t);
uintptr_t* const symbolPointers = (uintptr_t*)(sect->addr + fSlide);
- for (size_t pointerIndex=0; pointerIndex < pointerCount; ++pointerIndex) {
- uintptr_t newValue = interposedAddress(context, symbolPointers[pointerIndex], this);
- if ( newValue != symbolPointers[pointerIndex] )
- symbolPointers[pointerIndex] = newValue;
+ for (uint32_t pointerIndex=0; pointerIndex < pointerCount; ++pointerIndex) {
+ for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
+ // replace all references to 'replacee' with 'replacement'
+ if ( (symbolPointers[pointerIndex] == it->replacee) && (this != it->replacementImage) ) {
+ if ( context.verboseInterposing ) {
+ dyld::log("dyld: interposing: at %p replace 0x%lX with 0x%lX in %s\n",
+ &symbolPointers[pointerIndex], it->replacee, it->replacement, this->getPath());
+ }
+ symbolPointers[pointerIndex] = it->replacement;
+ }
+ }
}
}
#if __i386__
@@ -1974,10 +1975,16 @@
if ( entry[0] == 0xE9 ) { // 0xE9 == JMP
uint32_t rel32 = *((uint32_t*)&entry[1]); // assume unaligned load of uint32_t is ok
uint32_t target = (uint32_t)&entry[5] + rel32;
- uint32_t newTarget = interposedAddress(context, target, this);
- if ( newTarget != target ) {
- uint32_t newRel32 = newTarget - (uint32_t)&entry[5];
- *((uint32_t*)&entry[1]) = newRel32; // assume unaligned store of uint32_t is ok
+ for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
+ // replace all references to 'replacee' with 'replacement'
+ if ( (it->replacee == target) && (this != it->replacementImage) ) {
+ if ( context.verboseInterposing ) {
+ dyld::log("dyld: interposing: at %p replace JMP 0x%lX with JMP 0x%lX in %s\n",
+ &entry[1], it->replacee, it->replacement, this->getPath());
+ }
+ uint32_t newRel32 = it->replacement - (uint32_t)&entry[5];
+ *((uint32_t*)&entry[1]) = newRel32; // assume unaligned store of uint32_t is ok
+ }
}
}
}
@@ -2000,76 +2007,14 @@
case POINTER_RELOC:
{
uintptr_t* location = ((uintptr_t*)(reloc->r_address + relocBase));
- uintptr_t value = *location;
- uintptr_t newValue = interposedAddress(context, value, this);
- if ( newValue != value )
- *location = newValue;
- }
- break;
- }
- }
- }
-}
-
-void ImageLoaderMachOClassic::dynamicInterpose(const LinkContext& context)
-{
- if ( context.verboseInterposing )
- dyld::log("dyld: dynamic interposing %lu tuples onto image: %s\n", context.dynamicInterposeCount, this->getPath());
-
- // scan indirect symbols
- const uint32_t cmd_count = ((macho_header*)fMachOData)->ncmds;
- const struct load_command* const cmds = (struct load_command*)&fMachOData[sizeof(macho_header)];
- const struct load_command* cmd = cmds;
- for (uint32_t i = 0; i < cmd_count; ++i) {
- switch (cmd->cmd) {
- case LC_SEGMENT_COMMAND:
- {
- const struct macho_segment_command* seg = (struct macho_segment_command*)cmd;
- const struct macho_section* const sectionsStart = (struct macho_section*)((char*)seg + sizeof(struct macho_segment_command));
- const struct macho_section* const sectionsEnd = §ionsStart[seg->nsects];
- for (const struct macho_section* sect=sectionsStart; sect < sectionsEnd; ++sect) {
- const uint8_t type = sect->flags & SECTION_TYPE;
- if ( (type == S_NON_LAZY_SYMBOL_POINTERS) || (type == S_LAZY_SYMBOL_POINTERS) ) {
- const size_t pointerCount = sect->size / sizeof(uintptr_t);
- uintptr_t* const symbolPointers = (uintptr_t*)(sect->addr + fSlide);
- for (size_t pointerIndex=0; pointerIndex < pointerCount; ++pointerIndex) {
- for(size_t j=0; j < context.dynamicInterposeCount; ++j) {
- // replace all references to 'replacee' with 'replacement'
- if ( symbolPointers[pointerIndex] == (uintptr_t)context.dynamicInterposeArray[j].replacee ) {
- if ( context.verboseInterposing ) {
- dyld::log("dyld: dynamic interposing: at %p replace %p with %p in %s\n",
- &symbolPointers[pointerIndex], context.dynamicInterposeArray[j].replacee, context.dynamicInterposeArray[j].replacement, this->getPath());
- }
- symbolPointers[pointerIndex] = (uintptr_t)context.dynamicInterposeArray[j].replacement;
- }
+ for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
+ // replace all references to 'replacee' with 'replacement'
+ if ( (*location == it->replacee) && (this != it->replacementImage) ) {
+ if ( context.verboseInterposing ) {
+ dyld::log("dyld: interposing: at %p replace 0x%lX with 0x%lX in %s\n",
+ location, it->replacee, it->replacement, this->getPath());
}
- }
- }
- }
- }
- break;
- }
- cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
- }
-
- // scan external relocations
- const uintptr_t relocBase = this->getRelocBase();
- const relocation_info* const relocsStart = (struct relocation_info*)(&fLinkEditBase[fDynamicInfo->extreloff]);
- const relocation_info* const relocsEnd = &relocsStart[fDynamicInfo->nextrel];
- for (const relocation_info* reloc=relocsStart; reloc < relocsEnd; ++reloc) {
- if (reloc->r_length == RELOC_SIZE) {
- switch(reloc->r_type) {
- case POINTER_RELOC:
- {
- uintptr_t* location = ((uintptr_t*)(reloc->r_address + relocBase));
- for(size_t i=0; i < context.dynamicInterposeCount; ++i) {
- // replace all references to 'replacee' with 'replacement'
- if ( *location == (uintptr_t)context.dynamicInterposeArray[i].replacee ) {
- if ( context.verboseInterposing ) {
- dyld::log("dyld: dynamic interposing: at %p replace %p with %p in %s\n",
- location, context.dynamicInterposeArray[i].replacee, context.dynamicInterposeArray[i].replacement, this->getPath());
- }
- *location = (uintptr_t)context.dynamicInterposeArray[i].replacement;
+ *location = it->replacement;
}
}
}