Loading...
--- dyld/dyld-239.4/src/ImageLoaderMachO.cpp
+++ dyld/dyld-195.6/src/ImageLoaderMachO.cpp
@@ -40,17 +40,13 @@
#include <mach-o/loader.h>
#include <mach-o/nlist.h>
#include <sys/sysctl.h>
-#include <sys/syscall.h>
#include <libkern/OSAtomic.h>
#include <libkern/OSCacheControl.h>
#include <stdint.h>
-#include <System/sys/codesign.h>
#include "ImageLoaderMachO.h"
#include "ImageLoaderMachOCompressed.h"
-#if SUPPORT_CLASSIC_MACHO
#include "ImageLoaderMachOClassic.h"
-#endif
#include "mach-o/dyld_images.h"
// <rdar://problem/8718137> use stack guard random value to add padding between dylibs
@@ -64,14 +60,12 @@
#if __LP64__
#define LC_SEGMENT_COMMAND LC_SEGMENT_64
#define LC_ROUTINES_COMMAND LC_ROUTINES_64
- #define LC_SEGMENT_COMMAND_WRONG LC_SEGMENT
struct macho_segment_command : public segment_command_64 {};
struct macho_section : public section_64 {};
struct macho_routines_command : public routines_command_64 {};
#else
#define LC_SEGMENT_COMMAND LC_SEGMENT
#define LC_ROUTINES_COMMAND LC_ROUTINES
- #define LC_SEGMENT_COMMAND_WRONG LC_SEGMENT_64
struct macho_segment_command : public segment_command {};
struct macho_section : public section {};
struct macho_routines_command : public routines_command {};
@@ -94,7 +88,7 @@
fReadOnlyImportSegment(false),
#endif
fHasSubLibraries(false), fHasSubUmbrella(false), fInUmbrella(false), fHasDOFSections(false), fHasDashInit(false),
- fHasInitializers(false), fHasTerminators(false), fRegisteredAsRequiresCoalescing(false)
+ fHasInitializers(false), fHasTerminators(false), fGoodFirstSegment(false), fRegisteredAsRequiresCoalescing(false)
{
fIsSplitSeg = ((mh->flags & MH_SPLIT_SEGS) != 0);
@@ -120,23 +114,17 @@
// determine if this mach-o file has classic or compressed LINKEDIT and number of segments it has
void ImageLoaderMachO::sniffLoadCommands(const macho_header* mh, const char* path, bool* compressed,
- unsigned int* segCount, unsigned int* libCount, const LinkContext& context,
+ unsigned int* segCount, unsigned int* libCount,
const linkedit_data_command** codeSigCmd)
{
*compressed = false;
*segCount = 0;
*libCount = 0;
*codeSigCmd = NULL;
- struct macho_segment_command* segCmd;
- bool foundLoadCommandSegment = false;
- uint32_t loadCommandSegmentIndex = 0xFFFFFFFF;
- uintptr_t loadCommandSegmentVMStart = 0;
- uintptr_t loadCommandSegmentVMEnd = 0;
-
const uint32_t cmd_count = mh->ncmds;
- const struct load_command* const startCmds = (struct load_command*)(((uint8_t*)mh) + sizeof(macho_header));
+ const struct load_command* const cmds = (struct load_command*)(((uint8_t*)mh) + sizeof(macho_header));
const struct load_command* const endCmds = (struct load_command*)(((uint8_t*)mh) + sizeof(macho_header) + mh->sizeofcmds);
- const struct load_command* cmd = startCmds;
+ const struct load_command* cmd = cmds;
for (uint32_t i = 0; i < cmd_count; ++i) {
switch (cmd->cmd) {
case LC_DYLD_INFO:
@@ -144,26 +132,9 @@
*compressed = true;
break;
case LC_SEGMENT_COMMAND:
- segCmd = (struct macho_segment_command*)cmd;
// ignore zero-sized segments
- if ( segCmd->vmsize != 0 )
+ if ( ((struct macho_segment_command*)cmd)->vmsize != 0 )
*segCount += 1;
- // <rdar://problem/7942521> all load commands must be in an executable segment
- if ( context.codeSigningEnforced && (segCmd->fileoff < mh->sizeofcmds) && (segCmd->filesize != 0) ) {
- if ( (segCmd->fileoff != 0) || (segCmd->filesize < (mh->sizeofcmds+sizeof(macho_header))) )
- dyld::throwf("malformed mach-o image: segment %s does not span all load commands", segCmd->segname);
- if ( segCmd->initprot != (VM_PROT_READ | VM_PROT_EXECUTE) )
- dyld::throwf("malformed mach-o image: load commands found in segment %s with wrong permissions", segCmd->segname);
- if ( foundLoadCommandSegment )
- throw "load commands in multiple segments";
- foundLoadCommandSegment = true;
- loadCommandSegmentIndex = i;
- loadCommandSegmentVMStart = segCmd->vmaddr;
- loadCommandSegmentVMEnd = segCmd->vmaddr + segCmd->vmsize;
- }
- break;
- case LC_SEGMENT_COMMAND_WRONG:
- dyld::throwf("malformed mach-o image: wrong LC_SEGMENT[_64] for architecture");
break;
case LC_LOAD_DYLIB:
case LC_LOAD_WEAK_DYLIB:
@@ -177,34 +148,11 @@
}
uint32_t cmdLength = cmd->cmdsize;
cmd = (const struct load_command*)(((char*)cmd)+cmdLength);
- if ( (cmd > endCmds) || (cmd < startCmds) ) {
+ if ( cmd > endCmds ) {
dyld::throwf("malformed mach-o image: load command #%d length (%u) would exceed sizeofcmds (%u) in %s",
i, cmdLength, mh->sizeofcmds, path);
}
}
-
- if ( context.codeSigningEnforced && !foundLoadCommandSegment )
- throw "load commands not in a segment";
- // <rdar://problem/13145644> verify another segment does not over-map load commands
- cmd = startCmds;
- if ( context.codeSigningEnforced ) {
- for (uint32_t i = 0; i < cmd_count; ++i) {
- switch (cmd->cmd) {
- case LC_SEGMENT_COMMAND:
- if ( i != loadCommandSegmentIndex ) {
- segCmd = (struct macho_segment_command*)cmd;
- uintptr_t start = segCmd->vmaddr;
- uintptr_t end = segCmd->vmaddr + segCmd->vmsize;
- if ( ((start <= loadCommandSegmentVMStart) && (end > loadCommandSegmentVMStart))
- || ((start >= loadCommandSegmentVMStart) && (start < loadCommandSegmentVMEnd)) )
- dyld::throwf("malformed mach-o image: segment %s overlaps load commands", segCmd->segname);
- }
- break;
- }
- cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
- }
- }
-
// fSegmentsArrayCount is only 8-bits
if ( *segCount > 255 )
dyld::throwf("malformed mach-o image: more than 255 segments in %s", path);
@@ -228,16 +176,12 @@
unsigned int segCount;
unsigned int libCount;
const linkedit_data_command* codeSigCmd;
- sniffLoadCommands(mh, path, &compressed, &segCount, &libCount, context, &codeSigCmd);
+ sniffLoadCommands(mh, path, &compressed, &segCount, &libCount, &codeSigCmd);
// instantiate concrete class based on content of load commands
if ( compressed )
return ImageLoaderMachOCompressed::instantiateMainExecutable(mh, slide, path, segCount, libCount, context);
else
-#if SUPPORT_CLASSIC_MACHO
return ImageLoaderMachOClassic::instantiateMainExecutable(mh, slide, path, segCount, libCount, context);
-#else
- throw "missing LC_DYLD_INFO load command";
-#endif
}
@@ -260,16 +204,12 @@
unsigned int segCount;
unsigned int libCount;
const linkedit_data_command* codeSigCmd;
- sniffLoadCommands((const macho_header*)fileData, path, &compressed, &segCount, &libCount, context, &codeSigCmd);
+ sniffLoadCommands((const macho_header*)fileData, path, &compressed, &segCount, &libCount, &codeSigCmd);
// instantiate concrete class based on content of load commands
if ( compressed )
return ImageLoaderMachOCompressed::instantiateFromFile(path, fd, fileData, offsetInFat, lenInFat, info, segCount, libCount, codeSigCmd, context);
else
-#if SUPPORT_CLASSIC_MACHO
return ImageLoaderMachOClassic::instantiateFromFile(path, fd, fileData, offsetInFat, lenInFat, info, segCount, libCount, codeSigCmd, context);
-#else
- throw "missing LC_DYLD_INFO load command";
-#endif
}
// create image by using cached mach-o file
@@ -280,16 +220,12 @@
unsigned int segCount;
unsigned int libCount;
const linkedit_data_command* codeSigCmd;
- sniffLoadCommands(mh, path, &compressed, &segCount, &libCount, context, &codeSigCmd);
+ sniffLoadCommands(mh, path, &compressed, &segCount, &libCount, &codeSigCmd);
// instantiate concrete class based on content of load commands
if ( compressed )
return ImageLoaderMachOCompressed::instantiateFromCache(mh, path, slide, info, segCount, libCount, context);
else
-#if SUPPORT_CLASSIC_MACHO
return ImageLoaderMachOClassic::instantiateFromCache(mh, path, slide, info, segCount, libCount, context);
-#else
- throw "missing LC_DYLD_INFO load command";
-#endif
}
// create image by copying an in-memory mach-o file
@@ -299,33 +235,14 @@
unsigned int segCount;
unsigned int libCount;
const linkedit_data_command* sigcmd;
- sniffLoadCommands(mh, moduleName, &compressed, &segCount, &libCount, context, &sigcmd);
+ sniffLoadCommands(mh, moduleName, &compressed, &segCount, &libCount, &sigcmd);
// instantiate concrete class based on content of load commands
if ( compressed )
return ImageLoaderMachOCompressed::instantiateFromMemory(moduleName, mh, len, segCount, libCount, context);
else
-#if SUPPORT_CLASSIC_MACHO
return ImageLoaderMachOClassic::instantiateFromMemory(moduleName, mh, len, segCount, libCount, context);
-#else
- throw "missing LC_DYLD_INFO load command";
-#endif
-}
-
-
-int ImageLoaderMachO::crashIfInvalidCodeSignature()
-{
- // Now that segments are mapped in, try reading from first executable segment.
- // If code signing is enabled the kernel will validate the code signature
- // when paging in, and kill the process if invalid.
- for(unsigned int i=0; i < fSegmentsCount; ++i) {
- if ( (segFileOffset(i) == 0) && (segFileSize(i) != 0) ) {
- // return read value to ensure compiler does not optimize away load
- int* p = (int*)segActualLoadAddress(i);
- return *p;
- }
- }
- return 0;
-}
+}
+
void ImageLoaderMachO::parseLoadCmds()
@@ -370,8 +287,6 @@
const dyld_info_command* dyldInfo = NULL;
const macho_nlist* symbolTable = NULL;
const char* symbolTableStrings = NULL;
- const struct load_command* firstUnknownCmd = NULL;
- const struct version_min_command* minOSVersionCmd = 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)];
@@ -437,34 +352,14 @@
case LC_LOAD_WEAK_DYLIB:
case LC_REEXPORT_DYLIB:
case LC_LOAD_UPWARD_DYLIB:
- case LC_MAIN:
// do nothing, just prevent LC_REQ_DYLD exception from occuring
break;
- case LC_VERSION_MIN_MACOSX:
- case LC_VERSION_MIN_IPHONEOS:
- minOSVersionCmd = (version_min_command*)cmd;
- break;
default:
- if ( (cmd->cmd & LC_REQ_DYLD) != 0 ) {
- if ( firstUnknownCmd == NULL )
- firstUnknownCmd = cmd;
- }
- break;
+ if ( (cmd->cmd & LC_REQ_DYLD) != 0 )
+ dyld::throwf("unknown required load command 0x%08X", cmd->cmd);
}
cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
}
- if ( firstUnknownCmd != NULL ) {
- if ( minOSVersionCmd != NULL ) {
- dyld::throwf("cannot load '%s' because it was built for OS version %u.%u (load command 0x%08X is unknown)",
- this->getShortName(),
- minOSVersionCmd->version >> 16, ((minOSVersionCmd->version >> 8) & 0xff),
- firstUnknownCmd->cmd);
- }
- else {
- dyld::throwf("cannot load '%s' (load command 0x%08X is unknown)", this->getShortName(), firstUnknownCmd->cmd);
- }
- }
-
if ( dyldInfo != NULL )
this->setDyldInfo(dyldInfo);
@@ -751,57 +646,19 @@
fSlide = slide;
}
-void ImageLoaderMachO::loadCodeSignature(const struct linkedit_data_command* codeSigCmd, int fd, uint64_t offsetInFatFile, const LinkContext& context)
-{
- // if dylib being loaded has no code signature load command
- if ( codeSigCmd == NULL ) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED
- bool codeSigningEnforced = context.codeSigningEnforced;
- if ( context.mainExecutableCodeSigned && !codeSigningEnforced ) {
- static bool codeSignEnforcementDynamicallyEnabled = false;
- if ( !codeSignEnforcementDynamicallyEnabled ) {
- uint32_t flags;
- if ( csops(0, CS_OPS_STATUS, &flags, sizeof(flags)) != -1 ) {
- if ( flags & CS_ENFORCEMENT ) {
- codeSignEnforcementDynamicallyEnabled = true;
- }
- }
- }
- codeSigningEnforced = codeSignEnforcementDynamicallyEnabled;
- }
- // if we require dylibs to be code signed
- if ( codeSigningEnforced ) {
- // if there is a non-load command based code signature, use it
- off_t offset = (off_t)offsetInFatFile;
- if ( fcntl(fd, F_FINDSIGS, &offset, sizeof(offset)) != -1 )
- return;
- // otherwise gracefully return from dlopen()
- dyld::throwf("required code signature missing for '%s'\n", this->getPath());
- }
+#if CODESIGNING_SUPPORT
+void ImageLoaderMachO::loadCodeSignature(const struct linkedit_data_command* codeSigCmd, int fd, uint64_t offsetInFatFile)
+{
+ fsignatures_t siginfo;
+ siginfo.fs_file_start=offsetInFatFile; // start of mach-o slice in fat file
+ siginfo.fs_blob_start=(void*)(codeSigCmd->dataoff); // start of CD in mach-o file
+ siginfo.fs_blob_size=codeSigCmd->datasize; // size of CD
+ int result = fcntl(fd, F_ADDFILESIGS, &siginfo);
+ if ( result == -1 )
+ dyld::log("dyld: F_ADDFILESIGS failed for %s with errno=%d\n", this->getPath(), errno);
+ //dyld::log("dyld: registered code signature for %s\n", this->getPath());
+}
#endif
- }
- else {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED
- // <rdar://problem/13622786> ignore code signatures in binaries built with pre-10.9 tools
- if ( this->sdkVersion() < DYLD_MACOSX_VERSION_10_9 ) {
- return;
- }
-#endif
- fsignatures_t siginfo;
- siginfo.fs_file_start=offsetInFatFile; // start of mach-o slice in fat file
- siginfo.fs_blob_start=(void*)(long)(codeSigCmd->dataoff); // start of CD in mach-o file
- siginfo.fs_blob_size=codeSigCmd->datasize; // size of CD
- int result = fcntl(fd, F_ADDFILESIGS, &siginfo);
- if ( result == -1 ) {
- if ( (errno == EPERM) || (errno == EBADEXEC) )
- dyld::throwf("code signature invalid for '%s'\n", this->getPath());
- if ( context.verboseCodeSignatures )
- dyld::log("dyld: Failed registering code signature for %s, errno=%d\n", this->getPath(), errno);
- else
- dyld::log("dyld: Registered code signature for %s\n", this->getPath());
- }
- }
-}
const char* ImageLoaderMachO::getInstallPath() const
@@ -816,6 +673,11 @@
void ImageLoaderMachO::registerInterposing()
{
// mach-o files advertise interposing by having a __DATA __interpose section
+ uintptr_t textStart = this->segActualLoadAddress(0);
+ uintptr_t textEnd = this->segActualEndAddress(0);
+ // <rdar://problem/8268602> verify that the first segment load command is for a read-only segment
+ if ( ! fGoodFirstSegment )
+ return;
struct InterposeData { uintptr_t replacement; uintptr_t replacee; };
const uint32_t cmd_count = ((macho_header*)fMachOData)->ncmds;
const struct load_command* const cmds = (struct load_command*)&fMachOData[sizeof(macho_header)];
@@ -837,7 +699,7 @@
tuple.replacementImage = this;
tuple.replacee = interposeArray[i].replacee;
// <rdar://problem/7937695> verify that replacement is in this image
- if ( this->containsAddress((void*)tuple.replacement) ) {
+ if ( (tuple.replacement >= textStart) && (tuple.replacement < textEnd) ) {
for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
if ( it->replacee == tuple.replacee ) {
tuple.replacee = it->replacement;
@@ -855,44 +717,6 @@
}
}
-uint32_t ImageLoaderMachO::sdkVersion() const
-{
- 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;
- const struct version_min_command* versCmd;
- for (uint32_t i = 0; i < cmd_count; ++i) {
- switch ( cmd->cmd ) {
- case LC_VERSION_MIN_MACOSX:
- case LC_VERSION_MIN_IPHONEOS:
- versCmd = (version_min_command*)cmd;
- return versCmd->sdk;
- }
- cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
- }
- return 0;
-}
-
-void* ImageLoaderMachO::getThreadPC() const
-{
- 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) {
- if ( cmd->cmd == LC_MAIN ) {
- entry_point_command* mainCmd = (entry_point_command*)cmd;
- void* entry = (void*)(mainCmd->entryoff + (char*)fMachOData);
- // <rdar://problem/8543820&9228031> verify entry point is in image
- if ( this->containsAddress(entry) )
- return entry;
- else
- throw "LC_MAIN entryoff is out of range";
- }
- cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
- }
- return NULL;
-}
-
void* ImageLoaderMachO::getMain() const
{
@@ -903,28 +727,30 @@
switch (cmd->cmd) {
case LC_UNIXTHREAD:
{
- #if __i386__
+ #if __ppc__
+ const ppc_thread_state_t* registers = (ppc_thread_state_t*)(((char*)cmd) + 16);
+ return (void*)(registers->srr0 + fSlide);
+ #elif __ppc64__
+ const ppc_thread_state64_t* registers = (ppc_thread_state64_t*)(((char*)cmd) + 16);
+ return (void*)(registers->srr0 + fSlide);
+ #elif __i386__
const i386_thread_state_t* registers = (i386_thread_state_t*)(((char*)cmd) + 16);
- void* entry = (void*)(registers->eip + fSlide);
+ return (void*)(registers->eip + fSlide);
#elif __x86_64__
const x86_thread_state64_t* registers = (x86_thread_state64_t*)(((char*)cmd) + 16);
- void* entry = (void*)(registers->rip + fSlide);
+ return (void*)(registers->rip + fSlide);
#elif __arm__
const arm_thread_state_t* registers = (arm_thread_state_t*)(((char*)cmd) + 16);
- void* entry = (void*)(registers->__pc + fSlide);
+ return (void*)(registers->__pc + fSlide);
#else
#warning need processor specific code
#endif
- // <rdar://problem/8543820&9228031> verify entry point is in image
- if ( this->containsAddress(entry) ) {
- return entry;
- }
}
break;
}
cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
}
- throw "no valid entry point";
+ return NULL;
}
bool ImageLoaderMachO::needsAddedLibSystemDepency(unsigned int libCount, const macho_header* mh)
@@ -1078,8 +904,8 @@
bool found = false;
for(const char** rp = context.rootPaths; *rp != NULL; ++rp) {
char newPath[PATH_MAX];
- strlcpy(newPath, *rp, PATH_MAX);
- strlcat(newPath, path, PATH_MAX);
+ strcpy(newPath, *rp);
+ strcat(newPath, path);
struct stat stat_buf;
if ( stat(newPath, &stat_buf) != -1 ) {
//dyld::log("combined DYLD_ROOT_PATH and LC_RPATH: %s\n", newPath);
@@ -1196,10 +1022,8 @@
segMakeWritable(textSegmentIndex, context);
}
else {
- #if !__i386__ && !__x86_64__
- // some processors require range to be invalidated before it is made executable
+ // iPhoneOS requires range to be invalidated before it is made executable
sys_icache_invalidate((void*)segActualLoadAddress(textSegmentIndex), segSize(textSegmentIndex));
- #endif
segProtect(textSegmentIndex, context);
}
}
@@ -1240,7 +1064,7 @@
uintptr_t ImageLoaderMachO::getSymbolAddress(const Symbol* sym, const ImageLoader* requestor,
const LinkContext& context, bool runResolver) const
{
- uintptr_t result = exportedSymbolAddress(context, sym, requestor, runResolver);
+ uintptr_t result = exportedSymbolAddress(context, sym, runResolver);
// check for interposing overrides
for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
// replace all references to 'replacee' with 'replacement'
@@ -1482,7 +1306,9 @@
#if SUPPORT_OLD_CRT_INITIALIZATION
// first 16 bytes of "start" in crt1.o
-#if __i386__
+#if __ppc__
+ static uint32_t sStandardEntryPointInstructions[4] = { 0x7c3a0b78, 0x3821fffc, 0x54210034, 0x38000000 };
+#elif __i386__
static uint8_t sStandardEntryPointInstructions[16] = { 0x6a, 0x00, 0x89, 0xe5, 0x83, 0xe4, 0xf0, 0x83, 0xec, 0x10, 0x8b, 0x5d, 0x04, 0x89, 0x5c, 0x24 };
#endif
#endif
@@ -1505,10 +1331,11 @@
const uint32_t cmd_count = mh->ncmds;
const struct load_command* const cmds = (struct load_command*)&fMachOData[sizeof(macho_header)];
const struct load_command* cmd;
- // There used to be some optimizations to skip this section scan, but we need to handle the
- // __dyld section in libdyld.dylib, so everything needs to be scanned for now.
- // <rdar://problem/10910062> CrashTracer: 1,295 crashes in bash at bash: getenv
- if ( true ) {
+ // set up __dyld section
+ // optimizations:
+ // 1) do nothing if image is in dyld shared cache and dyld loaded at same address as when cache built
+ // 2) first read __dyld value, if already correct don't write, this prevents dirtying a page
+ if ( !fInSharedCache || !context.dyldLoadedAtSameAddressNeededBySharedCache ) {
cmd = cmds;
for (uint32_t i = 0; i < cmd_count; ++i) {
if ( cmd->cmd == LC_SEGMENT_COMMAND ) {
@@ -1550,16 +1377,6 @@
#endif
}
}
- else if ( mh->filetype == MH_DYLIB ) {
- const char* installPath = this->getInstallPath();
- if ( (installPath != NULL) && (strncmp(installPath, "/usr/lib/", 9) == 0) ) {
- if ( sect->size > offsetof(DATAdyld, vars) ) {
- // use ProgramVars from libdyld.dylib but tweak mh field to correct value
- dd->vars.mh = context.mainExecutable->machHeader();
- context.setNewProgramVars(dd->vars);
- }
- }
- }
}
else if ( (strcmp(sect->sectname, "__program_vars" ) == 0) && (mh->filetype == MH_EXECUTE) ) {
// this is a Mac OS X 10.6 or later main executable
@@ -1634,6 +1451,16 @@
void ImageLoaderMachO::doImageInit(const LinkContext& context)
{
if ( fHasDashInit ) {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ // <rdar://problem/8543820> verify initializers are in first segment for dylibs
+ if ( this->isDylib() && !fGoodFirstSegment ) {
+ if ( context.verboseInit )
+ dyld::log("dyld: ignoring -init in %s\n", this->getPath());
+ return;
+ }
+ uintptr_t textStart = this->segActualLoadAddress(0);
+ uintptr_t textEnd = this->segActualEndAddress(0);
+#endif
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;
@@ -1641,13 +1468,20 @@
switch (cmd->cmd) {
case LC_ROUTINES_COMMAND:
Initializer func = (Initializer)(((struct macho_routines_command*)cmd)->init_address + fSlide);
- // <rdar://problem/8543820&9228031> verify initializers are in image
- if ( ! this->containsAddress((void*)func) ) {
- dyld::throwf("initializer function %p not in mapped image for %s\n", func, this->getPath());
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ // <rdar://problem/8543820> verify initializers are in first segment for dylibs
+ if ( this->isDylib() && (((uintptr_t)func >= textEnd) || ((uintptr_t)func < textStart)) ) {
+ if ( context.verboseInit )
+ dyld::log("dyld: ignoring out of bounds initializer function %p in %s\n", func, this->getPath());
}
- if ( context.verboseInit )
- dyld::log("dyld: calling -init function %p in %s\n", func, this->getPath());
- func(context.argc, context.argv, context.envp, context.apple, &context.programVars);
+ else {
+#endif
+ if ( context.verboseInit )
+ dyld::log("dyld: calling -init function 0x%p in %s\n", func, this->getPath());
+ func(context.argc, context.argv, context.envp, context.apple, &context.programVars);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ }
+#endif
break;
}
cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
@@ -1658,6 +1492,16 @@
void ImageLoaderMachO::doModInitFunctions(const LinkContext& context)
{
if ( fHasInitializers ) {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ // <rdar://problem/8543820> verify initializers are in first segment for dylibs
+ if ( this->isDylib() && !fGoodFirstSegment ) {
+ if ( context.verboseInit )
+ dyld::log("dyld: ignoring all initializers in %s\n", this->getPath());
+ return;
+ }
+ uintptr_t textStart = this->segActualLoadAddress(0);
+ uintptr_t textEnd = this->segActualEndAddress(0);
+#endif
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;
@@ -1673,13 +1517,20 @@
const uint32_t count = sect->size / sizeof(uintptr_t);
for (uint32_t i=0; i < count; ++i) {
Initializer func = inits[i];
- // <rdar://problem/8543820&9228031> verify initializers are in image
- if ( ! this->containsAddress((void*)func) ) {
- dyld::throwf("initializer function %p not in mapped image for %s\n", func, this->getPath());
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ // <rdar://problem/8543820> verify initializers are in first segment for dylibs
+ if ( this->isDylib() && (((uintptr_t)func >= textEnd) || ((uintptr_t)func < textStart)) ) {
+ if ( context.verboseInit )
+ dyld::log("dyld: ignoring out of bounds initializer function %p in %s\n", func, this->getPath());
}
- if ( context.verboseInit )
- dyld::log("dyld: calling initializer function %p in %s\n", func, this->getPath());
- func(context.argc, context.argv, context.envp, context.apple, &context.programVars);
+ else {
+#endif
+ if ( context.verboseInit )
+ dyld::log("dyld: calling initializer function %p in %s\n", func, this->getPath());
+ func(context.argc, context.argv, context.envp, context.apple, &context.programVars);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ }
+#endif
}
}
}
@@ -1769,10 +1620,6 @@
const uint32_t count = sect->size / sizeof(uintptr_t);
for (uint32_t i=count; i > 0; --i) {
Terminator func = terms[i-1];
- // <rdar://problem/8543820&9228031> verify terminators are in image
- if ( ! this->containsAddress((void*)func) ) {
- dyld::throwf("termination function %p not in mapped image for %s\n", func, this->getPath());
- }
if ( context.verboseInit )
dyld::log("dyld: calling termination function %p in %s\n", func, this->getPath());
func();
@@ -1847,14 +1694,14 @@
// add small (0-3 pages) random padding between dylibs
addr = fgNextPIEDylibAddress + (__stack_chk_guard/fgNextPIEDylibAddress & (sizeof(long)-1))*4096;
//dyld::log("padding 0x%08llX, guard=0x%08llX\n", (long long)(addr - fgNextPIEDylibAddress), (long long)(__stack_chk_guard));
- kern_return_t r = vm_alloc(&addr, size, VM_FLAGS_FIXED | VM_MAKE_TAG(VM_MEMORY_DYLIB));
+ kern_return_t r = vm_allocate(mach_task_self(), &addr, size, VM_FLAGS_FIXED);
if ( r == KERN_SUCCESS ) {
fgNextPIEDylibAddress = addr + size;
return addr;
}
fgNextPIEDylibAddress = 0;
}
- kern_return_t r = vm_alloc(&addr, size, VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_MEMORY_DYLIB));
+ kern_return_t r = vm_allocate(mach_task_self(), &addr, size, VM_FLAGS_ANYWHERE);
if ( r != KERN_SUCCESS )
throw "out of address space";
@@ -1865,7 +1712,7 @@
{
vm_address_t addr = start;
vm_size_t size = length;
- kern_return_t r = vm_alloc(&addr, size, VM_FLAGS_FIXED | VM_MAKE_TAG(VM_MEMORY_DYLIB));
+ kern_return_t r = vm_allocate(mach_task_self(), &addr, size, false /*only this range*/);
if ( r != KERN_SUCCESS )
return false;
return true;
@@ -1879,11 +1726,24 @@
intptr_t slide = this->assignSegmentAddresses(context);
if ( context.verboseMapping )
dyld::log("dyld: Mapping %s\n", this->getPath());
+ // <rdar://problem/8268602> verify that the first segment load command is for a r-x segment
+ // that starts at begining of file and is larger than all load commands
+ uintptr_t firstSegMappedStart = segPreferredLoadAddress(0) + slide;
+ uintptr_t firstSegMappedEnd = firstSegMappedStart + this->segSize(0);
+ if ( (this->segLoadCommand(0)->initprot == (VM_PROT_EXECUTE|VM_PROT_READ))
+ && (this->segFileOffset(0) == 0)
+ && (this->segFileSize(0) != 0)
+ && (this->segSize(0) > ((macho_header*)fMachOData)->sizeofcmds) ) {
+ fGoodFirstSegment = true;
+ }
// map in all segments
for(unsigned int i=0, e=segmentCount(); i < e; ++i) {
vm_offset_t fileOffset = segFileOffset(i) + offsetInFat;
vm_size_t size = segFileSize(i);
uintptr_t requestedLoadAddress = segPreferredLoadAddress(i) + slide;
+ // <rdar://problem/8268602> verify other segments map after first
+ if ( (i != 0) && (requestedLoadAddress < firstSegMappedEnd) )
+ fGoodFirstSegment = false;
int protection = 0;
if ( !segUnaccessible(i) ) {
// If has text-relocs, don't set x-bit initially.
@@ -1907,7 +1767,7 @@
dyld::throwf("truncated mach-o error: segment %s extends to %llu which is past end of file %llu",
segName(i), (uint64_t)(fileOffset+size), fileLen);
}
- void* loadAddress = xmmap((void*)requestedLoadAddress, size, protection, MAP_FIXED | MAP_PRIVATE, fd, fileOffset);
+ void* loadAddress = mmap((void*)requestedLoadAddress, size, protection, MAP_FIXED | MAP_PRIVATE, fd, fileOffset);
if ( loadAddress == ((void*)(-1)) ) {
dyld::throwf("mmap() error %d at address=0x%08lX, size=0x%08lX segment=%s in Segment::map() mapping %s",
errno, requestedLoadAddress, (uintptr_t)size, segName(i), getPath());