Loading...
--- dyld/dyld-421.1/src/ImageLoaderMachOCompressed.cpp
+++ dyld/dyld-195.6/src/ImageLoaderMachOCompressed.cpp
@@ -23,27 +23,21 @@
*/
-#if __arm__ || __arm64__
- #include <System/sys/mman.h>
-#else
- #include <sys/mman.h>
-#endif
#include <string.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/stat.h>
+#include <sys/mman.h>
#include <sys/param.h>
#include <mach/mach.h>
#include <mach/thread_status.h>
#include <mach-o/loader.h>
+
#include "ImageLoaderMachOCompressed.h"
#include "mach-o/dyld_images.h"
-#ifndef EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE
- #define EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE 0x02
-#endif
// relocation_info.r_length field has value 3 for 64-bit executables and value 2 for 32-bit executables
#if __LP64__
@@ -62,6 +56,46 @@
struct macho_routines_command : public routines_command {};
#endif
+
+static uintptr_t read_uleb128(const uint8_t*& p, const uint8_t* end)
+{
+ uint64_t result = 0;
+ int bit = 0;
+ do {
+ if (p == end)
+ dyld::throwf("malformed uleb128");
+
+ uint64_t slice = *p & 0x7f;
+
+ if (bit > 63)
+ dyld::throwf("uleb128 too big for uint64, bit=%d, result=0x%0llX", bit, result);
+ else {
+ result |= (slice << bit);
+ bit += 7;
+ }
+ } while (*p++ & 0x80);
+ return result;
+}
+
+
+static intptr_t read_sleb128(const uint8_t*& p, const uint8_t* end)
+{
+ int64_t result = 0;
+ int bit = 0;
+ uint8_t byte;
+ do {
+ if (p == end)
+ throw "malformed sleb128";
+ byte = *p++;
+ result |= ((byte & 0x7f) << bit);
+ bit += 7;
+ } while (byte & 0x80);
+ // sign extend negative numbers
+ if ( (byte & 0x40) != 0 )
+ result |= (-1LL) << bit;
+ return result;
+}
+
// create image for main executable
ImageLoaderMachOCompressed* ImageLoaderMachOCompressed::instantiateMainExecutable(const macho_header* mh, uintptr_t slide, const char* path,
@@ -75,11 +109,11 @@
// for PIE record end of program, to know where to start loading dylibs
if ( slide != 0 )
fgNextPIEDylibAddress = (uintptr_t)image->getEnd();
-
- image->disableCoverageCheck();
+
+ image->setNeverUnload();
image->instantiateFinish(context);
image->setMapped(context);
-
+
if ( context.verboseMapping ) {
dyld::log("dyld: Main executable mapped %s\n", path);
for(unsigned int i=0, e=image->segmentCount(); i < e; ++i) {
@@ -95,12 +129,10 @@
}
// create image by mapping in a mach-o file
-ImageLoaderMachOCompressed* ImageLoaderMachOCompressed::instantiateFromFile(const char* path, int fd, const uint8_t* fileData, size_t lenFileData,
+ImageLoaderMachOCompressed* ImageLoaderMachOCompressed::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 struct encryption_info_command* encryptCmd,
- const LinkContext& context)
+ const struct linkedit_data_command* codeSigCmd, const LinkContext& context)
{
ImageLoaderMachOCompressed* image = ImageLoaderMachOCompressed::instantiateStart((macho_header*)fileData, path, segCount, libCount);
@@ -108,20 +140,14 @@
// record info about file
image->setFileInfo(info.st_dev, info.st_ino, info.st_mtime);
+ #if CODESIGNING_SUPPORT
// if this image is code signed, let kernel validate signature before mapping any pages from image
- image->loadCodeSignature(codeSigCmd, fd, offsetInFat, context);
+ if ( codeSigCmd != NULL )
+ image->loadCodeSignature(codeSigCmd, fd, offsetInFat);
+ #endif
- // Validate that first data we read with pread actually matches with code signature
- image->validateFirstPages(codeSigCmd, fd, fileData, lenFileData, offsetInFat, context);
-
// mmap segments
image->mapSegments(fd, offsetInFat, lenInFat, info.st_size, context);
-
- // if framework is FairPlay encrypted, register with kernel
- image->registerEncryption(encryptCmd, context);
-
- // probe to see if code signed correctly
- image->crashIfInvalidCodeSignature();
// finish construction
image->instantiateFinish(context);
@@ -135,12 +161,11 @@
else if ( (installName != NULL) && (strcmp(path, "/usr/lib/libgcc_s.1.dylib") == 0) && (strcmp(installName, "/usr/lib/libSystem.B.dylib") == 0) )
image->setPathUnowned("/usr/lib/libSystem.B.dylib");
#endif
- else if ( (path[0] != '/') || (strstr(path, "../") != NULL) ) {
- // rdar://problem/10733082 Fix up @rpath based paths during introspection
+ else if ( path[0] != '/' ) {
// rdar://problem/5135363 turn relative paths into absolute paths so gdb, Symbolication can later find them
char realPath[MAXPATHLEN];
- if ( fcntl(fd, F_GETPATH, realPath) == 0 )
- image->setPaths(path, realPath);
+ if ( realpath(path, realPath) != NULL )
+ image->setPath(realPath);
else
image->setPath(path);
}
@@ -179,9 +204,9 @@
// remember this is from shared cache and cannot be unloaded
image->fInSharedCache = true;
+ image->fGoodFirstSegment = true;
image->setNeverUnload();
image->setSlide(slide);
- image->disableCoverageCheck();
// segments already mapped in cache
if ( context.verboseMapping ) {
@@ -220,8 +245,6 @@
// for compatibility, never unload dylibs loaded from memory
image->setNeverUnload();
- image->disableCoverageCheck();
-
// bundle loads need path copied
if ( moduleName != NULL )
image->setPath(moduleName);
@@ -272,7 +295,7 @@
void ImageLoaderMachOCompressed::instantiateFinish(const LinkContext& context)
{
// now that segments are mapped in, get real fMachOData, fLinkEditBase, and fSlide
- this->parseLoadCmds(context);
+ this->parseLoadCmds();
}
uint32_t* ImageLoaderMachOCompressed::segmentCommandOffsets() const
@@ -349,11 +372,11 @@
// round to whole pages
- start = dyld_page_trunc(start);
- end = dyld_page_round(end);
+ start = start & (-4096);
+ end = (end + 4095) & (-4096);
// do nothing if only one page of rebase/bind info
- if ( (end-start) <= dyld_page_size )
+ if ( (end-start) <= 4096 )
return;
// tell kernel about our access to these pages
@@ -370,9 +393,6 @@
void ImageLoaderMachOCompressed::rebaseAt(const LinkContext& context, uintptr_t addr, uintptr_t slide, uint8_t type)
{
- if ( context.verboseRebase ) {
- dyld::log("dyld: rebase: %s:*0x%08lX += 0x%08lX\n", this->getShortName(), (uintptr_t)addr, slide);
- }
//dyld::log("0x%08lX type=%d\n", addr, type);
uintptr_t* locationToFix = (uintptr_t*)addr;
switch (type) {
@@ -390,14 +410,15 @@
void ImageLoaderMachOCompressed::throwBadRebaseAddress(uintptr_t address, uintptr_t segmentEndAddress, int segmentIndex,
const uint8_t* startOpcodes, const uint8_t* endOpcodes, const uint8_t* pos)
{
- dyld::throwf("malformed rebase opcodes (%ld/%ld): address 0x%08lX is outside of segment %s (0x%08lX -> 0x%08lX)",
+ dyld::throwf("malformed rebase opcodes (%ld/%ld): address 0x%08lX is beyond end of segment %s (0x%08lX -> 0x%08lX)",
(intptr_t)(pos-startOpcodes), (intptr_t)(endOpcodes-startOpcodes), address, segName(segmentIndex),
segActualLoadAddress(segmentIndex), segmentEndAddress);
}
-void ImageLoaderMachOCompressed::rebase(const LinkContext& context, uintptr_t slide)
+void ImageLoaderMachOCompressed::rebase(const LinkContext& context)
{
CRSetCrashLogMessage2(this->getPath());
+ const uintptr_t slide = this->fSlide;
const uint8_t* const start = fLinkEditBase + fDyldInfo->rebase_off;
const uint8_t* const end = &start[fDyldInfo->rebase_size];
const uint8_t* p = start;
@@ -406,10 +427,9 @@
uint8_t type = 0;
int segmentIndex = 0;
uintptr_t address = segActualLoadAddress(0);
- uintptr_t segmentStartAddress = segActualLoadAddress(0);
uintptr_t segmentEndAddress = segActualEndAddress(0);
- uintptr_t count;
- uintptr_t skip;
+ uint32_t count;
+ uint32_t skip;
bool done = false;
while ( !done && (p < end) ) {
uint8_t immediate = *p & REBASE_IMMEDIATE_MASK;
@@ -424,19 +444,11 @@
break;
case REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB:
segmentIndex = immediate;
- if ( segmentIndex >= fSegmentsCount )
- dyld::throwf("REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (0..%d)",
- segmentIndex, fSegmentsCount-1);
- #if TEXT_RELOC_SUPPORT
- if ( !segWriteable(segmentIndex) && !segHasRebaseFixUps(segmentIndex) && !segHasBindFixUps(segmentIndex) )
- #else
- if ( !segWriteable(segmentIndex) )
- #endif
- dyld::throwf("REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is not a writable segment (%s)",
- segmentIndex, segName(segmentIndex));
- segmentStartAddress = segActualLoadAddress(segmentIndex);
+ if ( segmentIndex > fSegmentsCount )
+ dyld::throwf("REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (%d)\n",
+ segmentIndex, fSegmentsCount);
+ address = segActualLoadAddress(segmentIndex) + read_uleb128(p, end);
segmentEndAddress = segActualEndAddress(segmentIndex);
- address = segmentStartAddress + read_uleb128(p, end);
break;
case REBASE_OPCODE_ADD_ADDR_ULEB:
address += read_uleb128(p, end);
@@ -446,7 +458,7 @@
break;
case REBASE_OPCODE_DO_REBASE_IMM_TIMES:
for (int i=0; i < immediate; ++i) {
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ if ( address >= segmentEndAddress )
throwBadRebaseAddress(address, segmentEndAddress, segmentIndex, start, end, p);
rebaseAt(context, address, slide, type);
address += sizeof(uintptr_t);
@@ -456,7 +468,7 @@
case REBASE_OPCODE_DO_REBASE_ULEB_TIMES:
count = read_uleb128(p, end);
for (uint32_t i=0; i < count; ++i) {
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ if ( address >= segmentEndAddress )
throwBadRebaseAddress(address, segmentEndAddress, segmentIndex, start, end, p);
rebaseAt(context, address, slide, type);
address += sizeof(uintptr_t);
@@ -464,7 +476,7 @@
fgTotalRebaseFixups += count;
break;
case REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB:
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ if ( address >= segmentEndAddress )
throwBadRebaseAddress(address, segmentEndAddress, segmentIndex, start, end, p);
rebaseAt(context, address, slide, type);
address += read_uleb128(p, end) + sizeof(uintptr_t);
@@ -474,7 +486,7 @@
count = read_uleb128(p, end);
skip = read_uleb128(p, end);
for (uint32_t i=0; i < count; ++i) {
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ if ( address >= segmentEndAddress )
throwBadRebaseAddress(address, segmentEndAddress, segmentIndex, start, end, p);
rebaseAt(context, address, slide, type);
address += skip + sizeof(uintptr_t);
@@ -494,7 +506,74 @@
CRSetCrashLogMessage2(NULL);
}
-const ImageLoader::Symbol* ImageLoaderMachOCompressed::findShallowExportedSymbol(const char* symbol, const ImageLoader** foundIn) const
+//
+// This function is the hotspot of symbol lookup. It was pulled out of findExportedSymbol()
+// to enable it to be re-written in assembler if needed.
+//
+const uint8_t* ImageLoaderMachOCompressed::trieWalk(const uint8_t* start, const uint8_t* end, const char* s)
+{
+ const uint8_t* p = start;
+ while ( p != NULL ) {
+ uint32_t terminalSize = *p++;
+ if ( terminalSize > 127 ) {
+ // except for re-export-with-rename, all terminal sizes fit in one byte
+ --p;
+ terminalSize = read_uleb128(p, end);
+ }
+ if ( (*s == '\0') && (terminalSize != 0) ) {
+ //dyld::log("trieWalk(%p) returning %p\n", start, p);
+ return p;
+ }
+ const uint8_t* children = p + terminalSize;
+ //dyld::log("trieWalk(%p) sym=%s, terminalSize=%d, children=%p\n", start, s, terminalSize, children);
+ uint8_t childrenRemaining = *children++;
+ p = children;
+ uint32_t nodeOffset = 0;
+ for (; childrenRemaining > 0; --childrenRemaining) {
+ const char* ss = s;
+ //dyld::log("trieWalk(%p) child str=%s\n", start, (char*)p);
+ bool wrongEdge = false;
+ // scan whole edge to get to next edge
+ // if edge is longer than target symbol name, don't read past end of symbol name
+ char c = *p;
+ while ( c != '\0' ) {
+ if ( !wrongEdge ) {
+ if ( c != *ss )
+ wrongEdge = true;
+ ++ss;
+ }
+ ++p;
+ c = *p;
+ }
+ if ( wrongEdge ) {
+ // advance to next child
+ ++p; // skip over zero terminator
+ // skip over uleb128 until last byte is found
+ while ( (*p & 0x80) != 0 )
+ ++p;
+ ++p; // skil over last byte of uleb128
+ }
+ else {
+ // the symbol so far matches this edge (child)
+ // so advance to the child's node
+ ++p;
+ nodeOffset = read_uleb128(p, end);
+ s = ss;
+ //dyld::log("trieWalk() found matching edge advancing to node 0x%x\n", nodeOffset);
+ break;
+ }
+ }
+ if ( nodeOffset != 0 )
+ p = &start[nodeOffset];
+ else
+ p = NULL;
+ }
+ //dyld::log("trieWalk(%p) return NULL\n", start);
+ return NULL;
+}
+
+
+const ImageLoader::Symbol* ImageLoaderMachOCompressed::findExportedSymbol(const char* symbol, const ImageLoader** foundIn) const
{
//dyld::log("Compressed::findExportedSymbol(%s) in %s\n", symbol, this->getShortName());
if ( fDyldInfo->export_size == 0 )
@@ -508,19 +587,18 @@
const uint8_t* foundNodeStart = this->trieWalk(start, end, symbol);
if ( foundNodeStart != NULL ) {
const uint8_t* p = foundNodeStart;
- const uintptr_t flags = read_uleb128(p, end);
+ const uint32_t flags = read_uleb128(p, end);
// found match, return pointer to terminal part of node
if ( flags & EXPORT_SYMBOL_FLAGS_REEXPORT ) {
// re-export from another dylib, lookup there
- const uintptr_t ordinal = read_uleb128(p, end);
+ const uint32_t ordinal = read_uleb128(p, end);
const char* importedName = (char*)p;
if ( importedName[0] == '\0' )
importedName = symbol;
if ( (ordinal > 0) && (ordinal <= libraryCount()) ) {
- const ImageLoader* reexportedFrom = libImage((unsigned int)ordinal-1);
+ const ImageLoader* reexportedFrom = libImage(ordinal-1);
//dyld::log("Compressed::findExportedSymbol(), %s -> %s/%s\n", symbol, reexportedFrom->getShortName(), importedName);
- const char* reExportLibPath = libPath((unsigned int)ordinal-1);
- return reexportedFrom->findExportedSymbol(importedName, true, reExportLibPath, foundIn);
+ return reexportedFrom->findExportedSymbol(importedName, true, foundIn);
}
else {
//dyld::throwf("bad mach-o binary, library ordinal (%u) invalid (max %u) for re-exported symbol %s in %s",
@@ -547,7 +625,7 @@
}
-uintptr_t ImageLoaderMachOCompressed::exportedSymbolAddress(const LinkContext& context, const Symbol* symbol, const ImageLoader* requestor, bool runResolver) const
+uintptr_t ImageLoaderMachOCompressed::exportedSymbolAddress(const LinkContext& context, const Symbol* symbol, bool runResolver) const
{
const uint8_t* exportNode = (uint8_t*)symbol;
const uint8_t* exportTrieStart = fLinkEditBase + fDyldInfo->export_off;
@@ -555,36 +633,27 @@
if ( (exportNode < exportTrieStart) || (exportNode > exportTrieEnd) )
throw "symbol is not in trie";
//dyld::log("exportedSymbolAddress(): node=%p, nodeOffset=0x%04X in %s\n", symbol, (int)((uint8_t*)symbol - exportTrieStart), this->getShortName());
- uintptr_t flags = read_uleb128(exportNode, exportTrieEnd);
- switch ( flags & EXPORT_SYMBOL_FLAGS_KIND_MASK ) {
- case EXPORT_SYMBOL_FLAGS_KIND_REGULAR:
- if ( runResolver && (flags & EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER) ) {
- // this node has a stub and resolver, run the resolver to get target address
- uintptr_t stub = read_uleb128(exportNode, exportTrieEnd) + (uintptr_t)fMachOData; // skip over stub
- // <rdar://problem/10657737> interposing dylibs have the stub address as their replacee
- uintptr_t interposedStub = interposedAddress(context, stub, requestor);
- if ( interposedStub != stub )
- return interposedStub;
- // stub was not interposed, so run resolver
- typedef uintptr_t (*ResolverProc)(void);
- ResolverProc resolver = (ResolverProc)(read_uleb128(exportNode, exportTrieEnd) + (uintptr_t)fMachOData);
- uintptr_t result = (*resolver)();
- if ( context.verboseBind )
- dyld::log("dyld: resolver at %p returned 0x%08lX\n", resolver, result);
- return result;
- }
- return read_uleb128(exportNode, exportTrieEnd) + (uintptr_t)fMachOData;
- case EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL:
- if ( flags & EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER )
- dyld::throwf("unsupported exported symbol kind. flags=%lu at node=%p", flags, symbol);
- return read_uleb128(exportNode, exportTrieEnd) + (uintptr_t)fMachOData;
- case EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE:
- if ( flags & EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER )
- dyld::throwf("unsupported exported symbol kind. flags=%lu at node=%p", flags, symbol);
- return read_uleb128(exportNode, exportTrieEnd);
- default:
- dyld::throwf("unsupported exported symbol kind. flags=%lu at node=%p", flags, symbol);
- }
+ uint32_t flags = read_uleb128(exportNode, exportTrieEnd);
+ if ( (flags & EXPORT_SYMBOL_FLAGS_KIND_MASK) == EXPORT_SYMBOL_FLAGS_KIND_REGULAR ) {
+ if ( runResolver && (flags & EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER) ) {
+ // this node has a stub and resolver, run the resolver to get target address
+ read_uleb128(exportNode, exportTrieEnd); // skip over stub
+ typedef uintptr_t (*ResolverProc)(void);
+ ResolverProc resolver = (ResolverProc)(read_uleb128(exportNode, exportTrieEnd) + (uintptr_t)fMachOData);
+ uintptr_t result = (*resolver)();
+ if ( context.verboseBind )
+ dyld::log("dyld: resolver at %p returned 0x%08lX\n", resolver, result);
+ return result;
+ }
+ return read_uleb128(exportNode, exportTrieEnd) + (uintptr_t)fMachOData;
+ }
+ else if ( (flags & EXPORT_SYMBOL_FLAGS_KIND_MASK) == EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL ) {
+ if ( flags & EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER )
+ dyld::throwf("unsupported exported symbol kind. flags=%d at node=%p", flags, symbol);
+ return read_uleb128(exportNode, exportTrieEnd) + (uintptr_t)fMachOData;
+ }
+ else
+ dyld::throwf("unsupported exported symbol kind. flags=%d at node=%p", flags, symbol);
}
bool ImageLoaderMachOCompressed::exportedSymbolIsWeakDefintion(const Symbol* symbol) const
@@ -594,7 +663,7 @@
const uint8_t* exportTrieEnd = exportTrieStart + fDyldInfo->export_size;
if ( (exportNode < exportTrieStart) || (exportNode > exportTrieEnd) )
throw "symbol is not in trie";
- uintptr_t flags = read_uleb128(exportNode, exportTrieEnd);
+ uint32_t flags = read_uleb128(exportNode, exportTrieEnd);
return ( flags & EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION );
}
@@ -636,14 +705,14 @@
{
const Symbol* sym;
if ( context.flatExportFinder(symbolName, &sym, foundIn) ) {
- if ( *foundIn != this )
- context.addDynamicReference(this, const_cast<ImageLoader*>(*foundIn));
+ if ( (*foundIn != this) && !(*foundIn)->neverUnload() )
+ this->addDynamicReference(*foundIn);
return (*foundIn)->getExportedSymbolAddress(sym, context, this, runResolver);
}
// 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->ImageLoaderMachO::findExportedSymbol(symbolName, false, foundIn);
if ( sym != NULL )
return (*foundIn)->getExportedSymbolAddress(sym, context, this, runResolver);
}
@@ -651,47 +720,31 @@
// definition can't be found anywhere, ok because it is weak, just return 0
return 0;
}
- throwSymbolNotFound(context, symbolName, this->getPath(), "", "flat namespace");
-}
-
-
-uintptr_t ImageLoaderMachOCompressed::resolveTwolevel(const LinkContext& context, const char* symbolName, const ImageLoader* definedInImage,
- const ImageLoader* requestorImage, unsigned requestorOrdinalOfDef, bool weak_import, bool runResolver,
- const ImageLoader** foundIn)
+ throwSymbolNotFound(context, symbolName, this->getPath(), "flat namespace");
+}
+
+
+uintptr_t ImageLoaderMachOCompressed::resolveTwolevel(const LinkContext& context, const ImageLoader* targetImage, bool weak_import,
+ const char* symbolName, bool runResolver, const ImageLoader** foundIn)
{
// two level lookup
- uintptr_t address;
- if ( definedInImage->findExportedSymbolAddress(context, symbolName, requestorImage, requestorOrdinalOfDef, runResolver, foundIn, &address) )
- return address;
-
+ const Symbol* sym = targetImage->findExportedSymbol(symbolName, true, foundIn);
+ if ( sym != NULL ) {
+ return (*foundIn)->getExportedSymbolAddress(sym, context, this, runResolver);
+ }
+
if ( weak_import ) {
// definition can't be found anywhere, ok because it is weak, just return 0
return 0;
}
- // nowhere to be found, check if maybe this image is too new for this OS
- char versMismatch[256];
- versMismatch[0] = '\0';
- uint32_t imageMinOS = this->minOSVersion();
- // dyld is always built for the current OS, so we can get the current OS version
- // from the load command in dyld itself.
- extern const mach_header __dso_handle;
- uint32_t dyldMinOS = ImageLoaderMachO::minOSVersion(&__dso_handle);
- if ( imageMinOS > dyldMinOS ) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED
- const char* msg = dyld::mkstringf(" (which was built for Mac OS X %d.%d)", imageMinOS >> 16, (imageMinOS >> 8) & 0xFF);
-#else
- const char* msg = dyld::mkstringf(" (which was built for iOS %d.%d)", imageMinOS >> 16, (imageMinOS >> 8) & 0xFF);
-#endif
- strcpy(versMismatch, msg);
- ::free((void*)msg);
- }
- throwSymbolNotFound(context, symbolName, this->getPath(), versMismatch, definedInImage->getPath());
+ // nowhere to be found
+ throwSymbolNotFound(context, symbolName, this->getPath(), targetImage->getPath());
}
uintptr_t ImageLoaderMachOCompressed::resolve(const LinkContext& context, const char* symbolName,
- uint8_t symboFlags, long libraryOrdinal, const ImageLoader** targetImage,
+ uint8_t symboFlags, int libraryOrdinal, const ImageLoader** targetImage,
LastLookup* last, bool runResolver)
{
*targetImage = NULL;
@@ -719,14 +772,14 @@
*targetImage = this;
}
else if ( libraryOrdinal <= 0 ) {
- dyld::throwf("bad mach-o binary, unknown special library ordinal (%ld) too big for symbol %s in %s",
+ dyld::throwf("bad mach-o binary, unknown special library ordinal (%u) too big for symbol %s in %s",
libraryOrdinal, symbolName, this->getPath());
}
else if ( (unsigned)libraryOrdinal <= libraryCount() ) {
- *targetImage = libImage((unsigned int)libraryOrdinal-1);
+ *targetImage = libImage(libraryOrdinal-1);
}
else {
- dyld::throwf("bad mach-o binary, library ordinal (%ld) too big (max %u) for symbol %s in %s",
+ dyld::throwf("bad mach-o binary, library ordinal (%u) too big (max %u) for symbol %s in %s",
libraryOrdinal, libraryCount(), symbolName, this->getPath());
}
if ( *targetImage == NULL ) {
@@ -735,15 +788,15 @@
symbolAddress = 0;
}
else {
- dyld::throwf("can't resolve symbol %s in %s because dependent dylib #%ld could not be loaded",
+ dyld::throwf("can't resolve symbol %s in %s because dependent dylib #%d could not be loaded",
symbolName, this->getPath(), libraryOrdinal);
}
}
else {
- symbolAddress = resolveTwolevel(context, symbolName, *targetImage, this, (unsigned)libraryOrdinal, weak_import, runResolver, targetImage);
- }
- }
-
+ symbolAddress = resolveTwolevel(context, *targetImage, weak_import, symbolName, runResolver, targetImage);
+ }
+ }
+
// save off lookup results if client wants
if ( last != NULL ) {
last->ordinal = libraryOrdinal;
@@ -757,24 +810,23 @@
}
uintptr_t ImageLoaderMachOCompressed::bindAt(const LinkContext& context, uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t symbolFlags, intptr_t addend, long libraryOrdinal, const char* msg,
+ uint8_t symboFlags, intptr_t addend, int libraryOrdinal, const char* msg,
LastLookup* last, bool runResolver)
{
const ImageLoader* targetImage;
uintptr_t symbolAddress;
// resolve symbol
- symbolAddress = this->resolve(context, symbolName, symbolFlags, libraryOrdinal, &targetImage, last, runResolver);
+ symbolAddress = this->resolve(context, symbolName, symboFlags, libraryOrdinal, &targetImage, last, runResolver);
// do actual update
- return this->bindLocation(context, addr, symbolAddress, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, msg);
-}
-
+ return this->bindLocation(context, addr, symbolAddress, targetImage, type, symbolName, addend, msg);
+}
void ImageLoaderMachOCompressed::throwBadBindingAddress(uintptr_t address, uintptr_t segmentEndAddress, int segmentIndex,
const uint8_t* startOpcodes, const uint8_t* endOpcodes, const uint8_t* pos)
{
- dyld::throwf("malformed binding opcodes (%ld/%ld): address 0x%08lX is outside segment %s (0x%08lX -> 0x%08lX)",
+ dyld::throwf("malformed binding opcodes (%ld/%ld): address 0x%08lX is beyond end of segment %s (0x%08lX -> 0x%08lX)",
(intptr_t)(pos-startOpcodes), (intptr_t)(endOpcodes-startOpcodes), address, segName(segmentIndex),
segActualLoadAddress(segmentIndex), segmentEndAddress);
}
@@ -790,8 +842,7 @@
// don't need to bind
}
else {
- uint64_t t0 = mach_absolute_time();
-
+
#if TEXT_RELOC_SUPPORT
// if there are __TEXT fixups, temporarily make __TEXT writable
if ( fTextSegmentBinds )
@@ -821,9 +872,6 @@
// tell kernel we are done with chunks of LINKEDIT
if ( !context.preFetchDisabled )
this->markFreeLINKEDIT(context);
-
- uint64_t t1 = mach_absolute_time();
- ImageLoader::fgTotalRebindCacheTime += (t1-t0);
}
// set up dyld entry points in image
@@ -842,18 +890,15 @@
{
try {
uint8_t type = 0;
- int segmentIndex = -1;
+ int segmentIndex = 0;
uintptr_t address = segActualLoadAddress(0);
- uintptr_t segmentStartAddress = segActualLoadAddress(0);
uintptr_t segmentEndAddress = segActualEndAddress(0);
const char* symbolName = NULL;
uint8_t symboFlags = 0;
- bool libraryOrdinalSet = false;
- long libraryOrdinal = 0;
+ int libraryOrdinal = 0;
intptr_t addend = 0;
- uintptr_t count;
- uintptr_t skip;
- uintptr_t segOffset;
+ uint32_t count;
+ uint32_t skip;
LastLookup last = { 0, 0, NULL, 0, NULL };
const uint8_t* const start = fLinkEditBase + fDyldInfo->bind_off;
const uint8_t* const end = &start[fDyldInfo->bind_size];
@@ -869,11 +914,9 @@
break;
case BIND_OPCODE_SET_DYLIB_ORDINAL_IMM:
libraryOrdinal = immediate;
- libraryOrdinalSet = true;
break;
case BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB:
libraryOrdinal = read_uleb128(p, end);
- libraryOrdinalSet = true;
break;
case BIND_OPCODE_SET_DYLIB_SPECIAL_IMM:
// the special ordinals are negative numbers
@@ -883,7 +926,6 @@
int8_t signExtended = BIND_OPCODE_MASK | immediate;
libraryOrdinal = signExtended;
}
- libraryOrdinalSet = true;
break;
case BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM:
symbolName = (char*)p;
@@ -900,72 +942,38 @@
break;
case BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB:
segmentIndex = immediate;
- if ( (segmentIndex >= fSegmentsCount) || (segmentIndex < 0) )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is out of range (0..%d)",
- segmentIndex, fSegmentsCount-1);
- #if TEXT_RELOC_SUPPORT
- if ( !segWriteable(segmentIndex) && !segHasRebaseFixUps(segmentIndex) && !segHasBindFixUps(segmentIndex) )
- #else
- if ( !segWriteable(segmentIndex) )
- #endif
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is not writable", segmentIndex);
- segOffset = read_uleb128(p, end);
- if ( segOffset > segSize(segmentIndex) )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has offset 0x%08lX beyond segment size (0x%08lX)", segOffset, segSize(segmentIndex));
- segmentStartAddress = segActualLoadAddress(segmentIndex);
- address = segmentStartAddress + segOffset;
+ if ( segmentIndex > fSegmentsCount )
+ dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (%d)\n",
+ segmentIndex, fSegmentsCount);
+ address = segActualLoadAddress(segmentIndex) + read_uleb128(p, end);
segmentEndAddress = segActualEndAddress(segmentIndex);
break;
case BIND_OPCODE_ADD_ADDR_ULEB:
address += read_uleb128(p, end);
break;
case BIND_OPCODE_DO_BIND:
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ if ( address >= segmentEndAddress )
throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
- if ( symbolName == NULL )
- dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM");
- if ( segmentIndex == -1 )
- dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB");
- if ( !libraryOrdinalSet )
- dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_DYLIB_ORDINAL*");
(this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "", &last, false);
address += sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB:
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ if ( address >= segmentEndAddress )
throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
- if ( symbolName == NULL )
- dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB missing preceding BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM");
- if ( segmentIndex == -1 )
- dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB missing preceding BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB");
- if ( !libraryOrdinalSet )
- dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB missing preceding BIND_OPCODE_SET_DYLIB_ORDINAL*");
(this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "", &last, false);
address += read_uleb128(p, end) + sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED:
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ if ( address >= segmentEndAddress )
throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
- if ( symbolName == NULL )
- dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED missing preceding BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM");
- if ( segmentIndex == -1 )
- dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED missing preceding BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB");
- if ( !libraryOrdinalSet )
- dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED missing preceding BIND_OPCODE_SET_DYLIB_ORDINAL*");
(this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "", &last, false);
address += immediate*sizeof(intptr_t) + sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB:
- if ( symbolName == NULL )
- dyld::throwf("BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB missing preceding BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM");
- if ( segmentIndex == -1 )
- dyld::throwf("BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB missing preceding BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB");
count = read_uleb128(p, end);
- if ( !libraryOrdinalSet )
- dyld::throwf("BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB missing preceding BIND_OPCODE_SET_DYLIB_ORDINAL*");
skip = read_uleb128(p, end);
for (uint32_t i=0; i < count; ++i) {
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ if ( address >= segmentEndAddress )
throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
(this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "", &last, false);
address += skip + sizeof(intptr_t);
@@ -987,14 +995,12 @@
{
try {
uint8_t type = BIND_TYPE_POINTER;
- int segmentIndex = -1;
+ int segmentIndex = 0;
uintptr_t address = segActualLoadAddress(0);
- uintptr_t segmentStartAddress = segActualLoadAddress(0);
uintptr_t segmentEndAddress = segActualEndAddress(0);
- uintptr_t segOffset;
const char* symbolName = NULL;
uint8_t symboFlags = 0;
- long libraryOrdinal = 0;
+ int libraryOrdinal = 0;
intptr_t addend = 0;
const uint8_t* const start = fLinkEditBase + fDyldInfo->lazy_bind_off;
const uint8_t* const end = &start[fDyldInfo->lazy_bind_size];
@@ -1038,29 +1044,19 @@
break;
case BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB:
segmentIndex = immediate;
- if ( (segmentIndex >= fSegmentsCount) || (segmentIndex < 0) )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is out of range (0..%d)",
- segmentIndex, fSegmentsCount-1);
- if ( !segWriteable(segmentIndex) )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is not writable", segmentIndex);
- segOffset = read_uleb128(p, end);
- if ( segOffset > segSize(segmentIndex) )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has offset 0x%08lX beyond segment size (0x%08lX)", segOffset, segSize(segmentIndex));
- segmentStartAddress = segActualLoadAddress(segmentIndex);
+ if ( segmentIndex > fSegmentsCount )
+ dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (%d)\n",
+ segmentIndex, fSegmentsCount);
+ address = segActualLoadAddress(segmentIndex) + read_uleb128(p, end);
segmentEndAddress = segActualEndAddress(segmentIndex);
- address = segmentStartAddress + segOffset;
break;
case BIND_OPCODE_ADD_ADDR_ULEB:
address += read_uleb128(p, end);
break;
case BIND_OPCODE_DO_BIND:
- if ( segmentIndex == -1 )
- dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB");
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ if ( address >= segmentEndAddress )
throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
- if ( symbolName == NULL )
- dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM");
- (this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "forced lazy ", NULL, false);
+ (this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "lazy forced", NULL, true);
address += sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB:
@@ -1124,11 +1120,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];
}
}
@@ -1153,7 +1149,6 @@
}
-
uintptr_t ImageLoaderMachOCompressed::doBindFastLazySymbol(uint32_t lazyBindingInfoOffset, const LinkContext& context,
void (*lock)(), void (*unlock)())
{
@@ -1169,26 +1164,73 @@
const uint8_t* const start = fLinkEditBase + fDyldInfo->lazy_bind_off;
const uint8_t* const end = &start[fDyldInfo->lazy_bind_size];
- uint8_t segIndex;
- uintptr_t segOffset;
- int libraryOrdinal;
- const char* symbolName;
- bool doneAfterBind;
- uintptr_t result;
- do {
- if ( ! getLazyBindingInfo(lazyBindingInfoOffset, start, end, &segIndex, &segOffset, &libraryOrdinal, &symbolName, &doneAfterBind) )
- dyld::throwf("bad lazy bind info");
-
- if ( segIndex >= fSegmentsCount )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (0..%d)",
- segIndex, fSegmentsCount-1);
- if ( segOffset > segSize(segIndex) )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has offset 0x%08lX beyond segment size (0x%08lX)", segOffset, segSize(segIndex));
- uintptr_t address = segActualLoadAddress(segIndex) + segOffset;
- result = this->bindAt(context, address, BIND_TYPE_POINTER, symbolName, 0, 0, libraryOrdinal, "lazy ", NULL, true);
- // <rdar://problem/24140465> Some old apps had multiple lazy symbols bound at once
- } while (!doneAfterBind && !context.strictMachORequired);
-
+ if ( lazyBindingInfoOffset > fDyldInfo->lazy_bind_size ) {
+ dyld::throwf("fast lazy bind offset out of range (%u, max=%u) in image %s",
+ lazyBindingInfoOffset, fDyldInfo->lazy_bind_size, this->getPath());
+ }
+
+ uint8_t type = BIND_TYPE_POINTER;
+ uintptr_t address = 0;
+ const char* symbolName = NULL;
+ uint8_t symboFlags = 0;
+ int libraryOrdinal = 0;
+ bool done = false;
+ uintptr_t result = 0;
+ const uint8_t* p = &start[lazyBindingInfoOffset];
+ while ( !done && (p < end) ) {
+ uint8_t immediate = *p & BIND_IMMEDIATE_MASK;
+ uint8_t opcode = *p & BIND_OPCODE_MASK;
+ ++p;
+ switch (opcode) {
+ case BIND_OPCODE_DONE:
+ done = true;
+ break;
+ case BIND_OPCODE_SET_DYLIB_ORDINAL_IMM:
+ libraryOrdinal = immediate;
+ break;
+ case BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB:
+ libraryOrdinal = read_uleb128(p, end);
+ break;
+ case BIND_OPCODE_SET_DYLIB_SPECIAL_IMM:
+ // the special ordinals are negative numbers
+ if ( immediate == 0 )
+ libraryOrdinal = 0;
+ else {
+ int8_t signExtended = BIND_OPCODE_MASK | immediate;
+ libraryOrdinal = signExtended;
+ }
+ break;
+ case BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM:
+ symbolName = (char*)p;
+ symboFlags = immediate;
+ while (*p != '\0')
+ ++p;
+ ++p;
+ break;
+ case BIND_OPCODE_SET_TYPE_IMM:
+ type = immediate;
+ break;
+ case BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB:
+ if ( immediate > fSegmentsCount )
+ dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (%d)\n",
+ immediate, fSegmentsCount);
+ address = segActualLoadAddress(immediate) + read_uleb128(p, end);
+ break;
+ case BIND_OPCODE_DO_BIND:
+
+
+ result = this->bindAt(context, address, type, symbolName, 0, 0, libraryOrdinal, "lazy ", NULL, true);
+ break;
+ case BIND_OPCODE_SET_ADDEND_SLEB:
+ case BIND_OPCODE_ADD_ADDR_ULEB:
+ case BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB:
+ case BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED:
+ case BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB:
+ default:
+ dyld::throwf("bad lazy bind opcode %d", *p);
+ }
+ }
+
if ( !this->usesTwoLevelNameSpace() ) {
// release dyld global lock
if ( unlock != NULL )
@@ -1197,7 +1239,7 @@
return result;
}
-void ImageLoaderMachOCompressed::initializeCoalIterator(CoalIterator& it, unsigned int loadOrder, unsigned)
+void ImageLoaderMachOCompressed::initializeCoalIterator(CoalIterator& it, unsigned int loadOrder)
{
it.image = this;
it.symbolName = " ";
@@ -1227,9 +1269,8 @@
const uint8_t* start = fLinkEditBase + fDyldInfo->weak_bind_off;
const uint8_t* p = start + it.curIndex;
const uint8_t* end = fLinkEditBase + fDyldInfo->weak_bind_off + this->fDyldInfo->weak_bind_size;
- uintptr_t count;
- uintptr_t skip;
- uintptr_t segOffset;
+ uint32_t count;
+ uint32_t skip;
while ( p < end ) {
uint8_t immediate = *p & BIND_IMMEDIATE_MASK;
uint8_t opcode = *p & BIND_OPCODE_MASK;
@@ -1256,24 +1297,10 @@
it.addend = read_sleb128(p, end);
break;
case BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB:
- if ( immediate >= fSegmentsCount )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (0..%d)",
- immediate, fSegmentsCount-1);
- #if __arm__
- // <rdar://problem/23138428> iOS app compatibility
- if ( !segWriteable(immediate) && it.image->isPositionIndependentExecutable() )
- #elif TEXT_RELOC_SUPPORT
- // <rdar://problem/23479396&23590867> i386 OS X app compatibility
- if ( !segWriteable(immediate) && !segHasRebaseFixUps(immediate) && !segHasBindFixUps(immediate)
- && (!it.image->isExecutable() || it.image->isPositionIndependentExecutable()) )
- #else
- if ( !segWriteable(immediate) )
- #endif
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB targets segment %s which is not writable", segName(immediate));
- segOffset = read_uleb128(p, end);
- if ( segOffset > segSize(immediate) )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has offset 0x%08lX beyond segment size (0x%08lX)", segOffset, segSize(immediate));
- it.address = segActualLoadAddress(immediate) + segOffset;
+ if ( immediate > fSegmentsCount )
+ dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (%d)\n",
+ immediate, fSegmentsCount);
+ it.address = segActualLoadAddress(immediate) + read_uleb128(p, end);
break;
case BIND_OPCODE_ADD_ADDR_ULEB:
it.address += read_uleb128(p, end);
@@ -1295,7 +1322,7 @@
}
break;
default:
- dyld::throwf("bad weak bind opcode '%d' found after processing %d bytes in '%s'", *p, (int)(p-start), this->getPath());
+ dyld::throwf("bad weak bind opcode %d", *p);
}
}
/// hmmm, BIND_OPCODE_DONE is missing...
@@ -1309,7 +1336,7 @@
{
//dyld::log("looking for %s in %s\n", it.symbolName, this->getPath());
const ImageLoader* foundIn = NULL;
- const ImageLoader::Symbol* sym = this->findShallowExportedSymbol(it.symbolName, &foundIn);
+ const ImageLoader::Symbol* sym = this->findExportedSymbol(it.symbolName, &foundIn);
if ( sym != NULL ) {
//dyld::log("sym=%p, foundIn=%p\n", sym, foundIn);
return foundIn->getExportedSymbolAddress(sym, context, this);
@@ -1318,7 +1345,7 @@
}
-void ImageLoaderMachOCompressed::updateUsesCoalIterator(CoalIterator& it, uintptr_t value, ImageLoader* targetImage, unsigned targetIndex, const LinkContext& context)
+void ImageLoaderMachOCompressed::updateUsesCoalIterator(CoalIterator& it, uintptr_t value, ImageLoader* targetImage, const LinkContext& context)
{
// <rdar://problem/6570879> weak binding done too early with inserted libraries
if ( this->getState() < dyld_image_state_bound )
@@ -1332,9 +1359,8 @@
uintptr_t address = it.address;
const char* symbolName = it.symbolName;
intptr_t addend = it.addend;
- uintptr_t count;
- uintptr_t skip;
- uintptr_t segOffset;
+ uint32_t count;
+ uint32_t skip;
bool done = false;
bool boundSomething = false;
while ( !done && (p < end) ) {
@@ -1355,40 +1381,26 @@
addend = read_sleb128(p, end);
break;
case BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB:
- if ( immediate >= fSegmentsCount )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (0..%d)",
- immediate, fSegmentsCount-1);
- #if __arm__
- // <rdar://problem/23138428> iOS app compatibility
- if ( !segWriteable(immediate) && it.image->isPositionIndependentExecutable() )
- #elif TEXT_RELOC_SUPPORT
- // <rdar://problem/23479396&23590867> i386 OS X app compatibility
- if ( !segWriteable(immediate) && !segHasRebaseFixUps(immediate) && !segHasBindFixUps(immediate)
- && (!it.image->isExecutable() || it.image->isPositionIndependentExecutable()) )
- #else
- if ( !segWriteable(immediate) )
- #endif
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB targets segment %s which is not writable", segName(immediate));
- segOffset = read_uleb128(p, end);
- if ( segOffset > segSize(immediate) )
- dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has offset 0x%08lX beyond segment size (0x%08lX)", segOffset, segSize(immediate));
- address = segActualLoadAddress(immediate) + segOffset;
+ if ( immediate > fSegmentsCount )
+ dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has segment %d which is too large (%d)\n",
+ immediate, fSegmentsCount);
+ address = segActualLoadAddress(immediate) + read_uleb128(p, end);
break;
case BIND_OPCODE_ADD_ADDR_ULEB:
address += read_uleb128(p, end);
break;
case BIND_OPCODE_DO_BIND:
- bindLocation(context, address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ");
+ bindLocation(context, address, value, targetImage, type, symbolName, addend, "weak ");
boundSomething = true;
address += sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB:
- bindLocation(context, address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ");
+ bindLocation(context, address, value, targetImage, type, symbolName, addend, "weak ");
boundSomething = true;
address += read_uleb128(p, end) + sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED:
- bindLocation(context, address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ");
+ bindLocation(context, address, value, targetImage, type, symbolName, addend, "weak ");
boundSomething = true;
address += immediate*sizeof(intptr_t) + sizeof(intptr_t);
break;
@@ -1396,7 +1408,7 @@
count = read_uleb128(p, end);
skip = read_uleb128(p, end);
for (uint32_t i=0; i < count; ++i) {
- bindLocation(context, address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ");
+ bindLocation(context, address, value, targetImage, type, symbolName, addend, "weak ");
boundSomething = true;
address += skip + sizeof(intptr_t);
}
@@ -1404,21 +1416,26 @@
default:
dyld::throwf("bad bind opcode %d in weak binding info", *p);
}
- }
- // C++ weak coalescing cannot be tracked by reference counting. Error on side of never unloading.
- if ( boundSomething && (targetImage != this) )
- context.addDynamicReference(this, targetImage);
+ }
+ if ( boundSomething && (targetImage != this) && !targetImage->neverUnload() )
+ this->addDynamicReference(targetImage);
}
uintptr_t ImageLoaderMachOCompressed::interposeAt(const LinkContext& context, uintptr_t addr, uint8_t type, const char*,
- uint8_t, intptr_t, long, const char*, LastLookup*, bool runResolver)
+ uint8_t, intptr_t, int, const char*, LastLookup*, bool runResolver)
{
if ( type == BIND_TYPE_POINTER ) {
uintptr_t* fixupLocation = (uintptr_t*)addr;
- uintptr_t curValue = *fixupLocation;
- uintptr_t newValue = interposedAddress(context, curValue, this);
- if ( newValue != curValue) {
- *fixupLocation = newValue;
+ uintptr_t value = *fixupLocation;
+ for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
+ // replace all references to 'replacee' with 'replacement'
+ if ( (value == it->replacee) && (this != it->replacementImage) ) {
+ if ( context.verboseInterposing ) {
+ dyld::log("dyld: interposing: at %p replace 0x%lX with 0x%lX in %s\n",
+ fixupLocation, it->replacee, it->replacement, this->getPath());
+ }
+ *fixupLocation = it->replacement;
+ }
}
}
return 0;
@@ -1435,41 +1452,79 @@
}
-uintptr_t ImageLoaderMachOCompressed::dynamicInterposeAt(const LinkContext& context, uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t, intptr_t, long, const char*, LastLookup*, bool runResolver)
-{
- if ( type == BIND_TYPE_POINTER ) {
- uintptr_t* fixupLocation = (uintptr_t*)addr;
- uintptr_t value = *fixupLocation;
- // don't apply interposing to table entries.
- if ( (context.dynamicInterposeArray <= (void*)addr) && ((void*)addr < &context.dynamicInterposeArray[context.dynamicInterposeCount]) )
- return 0;
- for(size_t i=0; i < context.dynamicInterposeCount; ++i) {
- if ( value == (uintptr_t)context.dynamicInterposeArray[i].replacee ) {
- if ( context.verboseInterposing ) {
- dyld::log("dyld: dynamic interposing: at %p replace %p with %p in %s\n",
- fixupLocation, context.dynamicInterposeArray[i].replacee, context.dynamicInterposeArray[i].replacement, this->getPath());
+
+
+const char* ImageLoaderMachOCompressed::findClosestSymbol(const void* addr, const void** closestAddr) const
+{
+ // called by dladdr()
+ // only works with compressed LINKEDIT if classic symbol table is also present
+ const macho_nlist* symbolTable = NULL;
+ const char* symbolTableStrings = NULL;
+ const dysymtab_command* dynSymbolTable = NULL;
+ 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_SYMTAB:
+ {
+ const struct symtab_command* symtab = (struct symtab_command*)cmd;
+ symbolTableStrings = (const char*)&fLinkEditBase[symtab->stroff];
+ symbolTable = (macho_nlist*)(&fLinkEditBase[symtab->symoff]);
}
- *fixupLocation = (uintptr_t)context.dynamicInterposeArray[i].replacement;
- }
- }
- }
- return 0;
-}
-
-void ImageLoaderMachOCompressed::dynamicInterpose(const LinkContext& context)
-{
- if ( context.verboseInterposing )
- dyld::log("dyld: dynamic interposing %lu tuples onto image: %s\n", context.dynamicInterposeCount, this->getPath());
-
- // update already bound references to symbols
- eachBind(context, &ImageLoaderMachOCompressed::dynamicInterposeAt);
- eachLazyBind(context, &ImageLoaderMachOCompressed::dynamicInterposeAt);
-}
-
-const char* ImageLoaderMachOCompressed::findClosestSymbol(const void* addr, const void** closestAddr) const
-{
- return ImageLoaderMachO::findClosestSymbol((mach_header*)fMachOData, addr, closestAddr);
+ break;
+ case LC_DYSYMTAB:
+ dynSymbolTable = (struct dysymtab_command*)cmd;
+ break;
+ }
+ cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
+ }
+ // no symbol table => no lookup by address
+ if ( (symbolTable == NULL) || (dynSymbolTable == NULL) )
+ return NULL;
+
+ uintptr_t targetAddress = (uintptr_t)addr - fSlide;
+ const struct macho_nlist* bestSymbol = NULL;
+ // first walk all global symbols
+ const struct macho_nlist* const globalsStart = &symbolTable[dynSymbolTable->iextdefsym];
+ const struct macho_nlist* const globalsEnd= &globalsStart[dynSymbolTable->nextdefsym];
+ for (const struct macho_nlist* s = globalsStart; s < globalsEnd; ++s) {
+ if ( (s->n_type & N_TYPE) == N_SECT ) {
+ if ( bestSymbol == NULL ) {
+ if ( s->n_value <= targetAddress )
+ bestSymbol = s;
+ }
+ else if ( (s->n_value <= targetAddress) && (bestSymbol->n_value < s->n_value) ) {
+ bestSymbol = s;
+ }
+ }
+ }
+ // next walk all local symbols
+ const struct macho_nlist* const localsStart = &symbolTable[dynSymbolTable->ilocalsym];
+ const struct macho_nlist* const localsEnd= &localsStart[dynSymbolTable->nlocalsym];
+ for (const struct macho_nlist* s = localsStart; s < localsEnd; ++s) {
+ if ( ((s->n_type & N_TYPE) == N_SECT) && ((s->n_type & N_STAB) == 0) ) {
+ if ( bestSymbol == NULL ) {
+ if ( s->n_value <= targetAddress )
+ bestSymbol = s;
+ }
+ else if ( (s->n_value <= targetAddress) && (bestSymbol->n_value < s->n_value) ) {
+ bestSymbol = s;
+ }
+ }
+ }
+ if ( bestSymbol != NULL ) {
+#if __arm__
+ if (bestSymbol->n_desc & N_ARM_THUMB_DEF)
+ *closestAddr = (void*)((bestSymbol->n_value | 1) + fSlide);
+ else
+ *closestAddr = (void*)(bestSymbol->n_value + fSlide);
+#else
+ *closestAddr = (void*)(bestSymbol->n_value + fSlide);
+#endif
+ return &symbolTableStrings[bestSymbol->n_un.n_strx];
+ }
+ return NULL;
}
@@ -1482,7 +1537,7 @@
#if __arm__ || __x86_64__
-void ImageLoaderMachOCompressed::updateAlternateLazyPointer(uint8_t* stub, void** originalLazyPointerAddr, const LinkContext& context)
+void ImageLoaderMachOCompressed::updateAlternateLazyPointer(uint8_t* stub, void** originalLazyPointerAddr)
{
#if __arm__
uint32_t* instructions = (uint32_t*)stub;
@@ -1502,17 +1557,8 @@
// if stub does not use original lazy pointer (meaning it was optimized by update_dyld_shared_cache)
if ( lazyPointerAddr != originalLazyPointerAddr ) {
- // <rdar://problem/12928448> only de-optimization lazy pointers if they are part of shared cache not loaded (because overridden)
- const ImageLoader* lazyPointerImage = context.findImageContainingAddress(lazyPointerAddr);
- if ( lazyPointerImage != NULL )
- return;
-
// copy newly re-bound lazy pointer value to shared lazy pointer
*lazyPointerAddr = *originalLazyPointerAddr;
-
- if ( context.verboseBind )
- dyld::log("dyld: alter bind: %s: *0x%08lX = 0x%08lX \n",
- this->getShortName(), (long)lazyPointerAddr, (long)*originalLazyPointerAddr);
}
}
#endif
@@ -1522,8 +1568,9 @@
void ImageLoaderMachOCompressed::updateOptimizedLazyPointers(const LinkContext& context)
{
#if __arm__ || __x86_64__
- // find stubs and indirect symbol table
+ // find stubs and lazy pointer sections
const struct macho_section* stubsSection = NULL;
+ const struct macho_section* lazyPointerSection = NULL;
const dysymtab_command* dynSymbolTable = NULL;
const macho_header* mh = (macho_header*)fMachOData;
const uint32_t cmd_count = mh->ncmds;
@@ -1538,6 +1585,8 @@
const uint8_t type = sect->flags & SECTION_TYPE;
if ( type == S_SYMBOL_STUBS )
stubsSection = sect;
+ else if ( type == S_LAZY_SYMBOL_POINTERS )
+ lazyPointerSection = sect;
}
}
else if ( cmd->cmd == LC_DYSYMTAB ) {
@@ -1545,81 +1594,37 @@
}
cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
}
+
+ // sanity check
if ( dynSymbolTable == NULL )
return;
- const uint32_t* const indirectTable = (uint32_t*)&fLinkEditBase[dynSymbolTable->indirectsymoff];
- if ( stubsSection == NULL )
+ if ( (stubsSection == NULL) || (lazyPointerSection == NULL) )
return;
- const uint32_t stubsSize = stubsSection->reserved2;
- const uint32_t stubsCount = (uint32_t)(stubsSection->size / stubsSize);
+ const uint32_t stubsCount = stubsSection->size / stubsSection->reserved2;
+ const uint32_t lazyPointersCount = lazyPointerSection->size / sizeof(void*);
+ if ( stubsCount != lazyPointersCount )
+ return;
const uint32_t stubsIndirectTableOffset = stubsSection->reserved1;
+ const uint32_t lazyPointersIndirectTableOffset = lazyPointerSection->reserved1;
if ( (stubsIndirectTableOffset+stubsCount) > dynSymbolTable->nindirectsyms )
return;
- uint8_t* const stubsAddr = (uint8_t*)(stubsSection->addr + this->fSlide);
-
- // for each lazy pointer section
- cmd = cmds;
- for (uint32_t i = 0; i < cmd_count; ++i) {
- if (cmd->cmd == 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* lazyPointerSection=sectionsStart; lazyPointerSection < sectionsEnd; ++lazyPointerSection) {
- const uint8_t type = lazyPointerSection->flags & SECTION_TYPE;
- if ( type != S_LAZY_SYMBOL_POINTERS )
- continue;
- const uint32_t lazyPointersCount = (uint32_t)(lazyPointerSection->size / sizeof(void*));
- const uint32_t lazyPointersIndirectTableOffset = lazyPointerSection->reserved1;
- if ( (lazyPointersIndirectTableOffset+lazyPointersCount) > dynSymbolTable->nindirectsyms )
- continue;
- void** const lazyPointersAddr = (void**)(lazyPointerSection->addr + this->fSlide);
- // for each lazy pointer
- for(uint32_t lpIndex=0; lpIndex < lazyPointersCount; ++lpIndex) {
- const uint32_t lpSymbolIndex = indirectTable[lazyPointersIndirectTableOffset+lpIndex];
- // find matching stub and validate it uses this lazy pointer
- for(uint32_t stubIndex=0; stubIndex < stubsCount; ++stubIndex) {
- if ( indirectTable[stubsIndirectTableOffset+stubIndex] == lpSymbolIndex ) {
- this->updateAlternateLazyPointer(stubsAddr+stubIndex*stubsSize, &lazyPointersAddr[lpIndex], context);
- break;
- }
- }
- }
-
- }
- }
- cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
- }
-
+ if ( (lazyPointersIndirectTableOffset+lazyPointersCount) > dynSymbolTable->nindirectsyms )
+ return;
+
+ // walk stubs and lazy pointers
+ const uint32_t* const indirectTable = (uint32_t*)&fLinkEditBase[dynSymbolTable->indirectsymoff];
+ void** const lazyPointersStartAddr = (void**)(lazyPointerSection->addr + this->fSlide);
+ uint8_t* const stubsStartAddr = (uint8_t*)(stubsSection->addr + this->fSlide);
+ uint8_t* stub = stubsStartAddr;
+ void** lpa = lazyPointersStartAddr;
+ for(uint32_t i=0; i < stubsCount; ++i, stub += stubsSection->reserved2, ++lpa) {
+ // sanity check symbol index of stub and lazy pointer match
+ if ( indirectTable[stubsIndirectTableOffset+i] != indirectTable[lazyPointersIndirectTableOffset+i] )
+ continue;
+ this->updateAlternateLazyPointer(stub, lpa);
+ }
+
#endif
}
-void ImageLoaderMachOCompressed::registerEncryption(const encryption_info_command* encryptCmd, const LinkContext& context)
-{
-#if __arm__ || __arm64__
- if ( encryptCmd == NULL )
- return;
- const mach_header* mh = NULL;
- for(unsigned int i=0; i < fSegmentsCount; ++i) {
- if ( (segFileOffset(i) == 0) && (segFileSize(i) != 0) ) {
- mh = (mach_header*)segActualLoadAddress(i);
- break;
- }
- }
- void* start = ((uint8_t*)mh) + encryptCmd->cryptoff;
- size_t len = encryptCmd->cryptsize;
- uint32_t cputype = mh->cputype;
- uint32_t cpusubtype = mh->cpusubtype;
- uint32_t cryptid = encryptCmd->cryptid;
- if (context.verboseMapping) {
- dyld::log(" 0x%08lX->0x%08lX configured for FairPlay decryption\n", (long)start, (long)start+len);
- }
- int result = mremap_encrypted(start, len, cryptid, cputype, cpusubtype);
- if ( result != 0 ) {
- dyld::throwf("mremap_encrypted() => %d, errno=%d for %s\n", result, errno, this->getPath());
- }
-#endif
-}
-
-
-