Loading...
--- dyld/dyld-239.4/src/ImageLoaderMachO.cpp
+++ dyld/dyld-360.21/src/ImageLoaderMachO.cpp
@@ -60,6 +60,15 @@
#define LC_LOAD_UPWARD_DYLIB (0x23|LC_REQ_DYLD) /* load of dylib whose initializers run later */
#endif
+#ifndef LC_VERSION_MIN_TVOS
+ #define LC_VERSION_MIN_TVOS 0x2F
+#endif
+
+#ifndef LC_VERSION_MIN_WATCHOS
+ #define LC_VERSION_MIN_WATCHOS 0x30
+#endif
+
+
// relocation_info.r_length field has value 3 for 64-bit executables and value 2 for 32-bit executables
#if __LP64__
#define LC_SEGMENT_COMMAND LC_SEGMENT_64
@@ -83,9 +92,9 @@
ImageLoaderMachO::ImageLoaderMachO(const macho_header* mh, const char* path, unsigned int segCount,
uint32_t segOffsets[], unsigned int libCount)
- : ImageLoader(path, libCount), fMachOData((uint8_t*)mh), fLinkEditBase(NULL), fSlide(0),
+ : ImageLoader(path, libCount), fCoveredCodeLength(0), fMachOData((uint8_t*)mh), fLinkEditBase(NULL), fSlide(0),
fEHFrameSectionOffset(0), fUnwindInfoSectionOffset(0), fDylibIDOffset(0),
- fSegmentsCount(segCount), fIsSplitSeg(false), fInSharedCache(false),
+fSegmentsCount(segCount), fIsSplitSeg(false), fInSharedCache(false),
#if TEXT_RELOC_SUPPORT
fTextSegmentRebases(false),
fTextSegmentBinds(false),
@@ -109,7 +118,7 @@
// ignore zero-sized segments
if ( segCmd->vmsize != 0 ) {
// record offset of load command
- segOffsets[segIndex++] = (uint8_t*)segCmd - fMachOData;
+ segOffsets[segIndex++] = (uint32_t)((uint8_t*)segCmd - fMachOData);
}
}
cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
@@ -119,25 +128,34 @@
// 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,
+void ImageLoaderMachO::sniffLoadCommands(const macho_header* mh, const char* path, bool inCache, bool* compressed,
unsigned int* segCount, unsigned int* libCount, const LinkContext& context,
- const linkedit_data_command** codeSigCmd)
+ const linkedit_data_command** codeSigCmd,
+ const encryption_info_command** encryptCmd)
{
*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;
+ *encryptCmd = NULL;
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 endCmds = (struct load_command*)(((uint8_t*)mh) + sizeof(macho_header) + mh->sizeofcmds);
const struct load_command* cmd = startCmds;
+ bool foundLoadCommandSegment = false;
for (uint32_t i = 0; i < cmd_count; ++i) {
+ uint32_t cmdLength = cmd->cmdsize;
+ struct macho_segment_command* segCmd;
+ if ( cmdLength < 8 ) {
+ dyld::throwf("malformed mach-o image: load command #%d length (%u) too small in %s",
+ i, cmdLength, path);
+ }
+ const struct load_command* const nextCmd = (const struct load_command*)(((char*)cmd)+cmdLength);
+ if ( (nextCmd > endCmds) || (nextCmd < cmd) ) {
+ dyld::throwf("malformed mach-o image: load command #%d length (%u) would exceed sizeofcmds (%u) in %s",
+ i, cmdLength, mh->sizeofcmds, path);
+ }
switch (cmd->cmd) {
case LC_DYLD_INFO:
case LC_DYLD_INFO_ONLY:
@@ -145,21 +163,56 @@
break;
case LC_SEGMENT_COMMAND:
segCmd = (struct macho_segment_command*)cmd;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
+ // rdar://problem/19617624 allow unmapped segments on OSX (but not iOS)
+ if ( (segCmd->filesize > segCmd->vmsize) && (segCmd->vmsize != 0) )
+#else
+ if ( segCmd->filesize > segCmd->vmsize )
+#endif
+ dyld::throwf("malformed mach-o image: segment load command %s filesize is larger than vmsize", segCmd->segname);
// ignore zero-sized segments
if ( segCmd->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;
+ if ( context.codeSigningEnforced ) {
+ uintptr_t vmStart = segCmd->vmaddr;
+ uintptr_t vmSize = segCmd->vmsize;
+ uintptr_t vmEnd = vmStart + vmSize;
+ uintptr_t fileStart = segCmd->fileoff;
+ uintptr_t fileSize = segCmd->filesize;
+ if ( (intptr_t)(vmEnd) < 0)
+ dyld::throwf("malformed mach-o image: segment load command %s vmsize too large", segCmd->segname);
+ if ( vmStart > vmEnd )
+ dyld::throwf("malformed mach-o image: segment load command %s wraps around address space", segCmd->segname);
+ if ( vmSize != fileSize ) {
+ if ( (segCmd->initprot == 0) && (fileSize != 0) )
+ dyld::throwf("malformed mach-o image: unaccessable segment %s has filesize != 0", segCmd->segname);
+ else if ( vmSize < fileSize )
+ dyld::throwf("malformed mach-o image: segment %s has vmsize < filesize", segCmd->segname);
+ }
+ if ( inCache ) {
+ if ( (fileSize != 0) && (segCmd->initprot == (VM_PROT_READ | VM_PROT_EXECUTE)) ) {
+ if ( foundLoadCommandSegment )
+ throw "load commands in multiple segments";
+ foundLoadCommandSegment = true;
+ }
+ }
+ else if ( (fileStart < mh->sizeofcmds) && (fileSize != 0) ) {
+ // <rdar://problem/7942521> all load commands must be in an executable segment
+ if ( (fileStart != 0) || (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;
+ }
+
+ const struct macho_section* const sectionsStart = (struct macho_section*)((char*)segCmd + sizeof(struct macho_segment_command));
+ const struct macho_section* const sectionsEnd = §ionsStart[segCmd->nsects];
+ for (const struct macho_section* sect=sectionsStart; sect < sectionsEnd; ++sect) {
+ if (!inCache && sect->offset != 0 && ((sect->offset + sect->size) > (segCmd->fileoff + segCmd->filesize)))
+ dyld::throwf("malformed mach-o image: section %s,%s of '%s' exceeds segment %s booundary", sect->segname, sect->sectname, path, segCmd->segname);
+ }
}
break;
case LC_SEGMENT_COMMAND_WRONG:
@@ -174,41 +227,68 @@
case LC_CODE_SIGNATURE:
*codeSigCmd = (struct linkedit_data_command*)cmd; // only support one LC_CODE_SIGNATURE per image
break;
- }
- uint32_t cmdLength = cmd->cmdsize;
- cmd = (const struct load_command*)(((char*)cmd)+cmdLength);
- if ( (cmd > endCmds) || (cmd < startCmds) ) {
- dyld::throwf("malformed mach-o image: load command #%d length (%u) would exceed sizeofcmds (%u) in %s",
- i, cmdLength, mh->sizeofcmds, path);
- }
- }
-
+ case LC_ENCRYPTION_INFO:
+ case LC_ENCRYPTION_INFO_64:
+ *encryptCmd = (struct encryption_info_command*)cmd; // only support one LC_ENCRYPTION_INFO[_64] per image
+ break;
+ }
+ cmd = nextCmd;
+ }
+
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;
+
+ // <rdar://problem/13145644> verify every segment does not overlap another segment
if ( context.codeSigningEnforced ) {
+ uintptr_t lastFileStart = 0;
+ uintptr_t linkeditFileStart = 0;
+ const struct load_command* cmd1 = startCmds;
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);
+ if ( cmd1->cmd == LC_SEGMENT_COMMAND ) {
+ struct macho_segment_command* segCmd1 = (struct macho_segment_command*)cmd1;
+ uintptr_t vmStart1 = segCmd1->vmaddr;
+ uintptr_t vmEnd1 = segCmd1->vmaddr + segCmd1->vmsize;
+ uintptr_t fileStart1 = segCmd1->fileoff;
+ uintptr_t fileEnd1 = segCmd1->fileoff + segCmd1->filesize;
+
+ if (fileStart1 > lastFileStart)
+ lastFileStart = fileStart1;
+
+ if ( strcmp(&segCmd1->segname[0], "__LINKEDIT") == 0 ) {
+ linkeditFileStart = fileStart1;
+ }
+
+ const struct load_command* cmd2 = startCmds;
+ for (uint32_t j = 0; j < cmd_count; ++j) {
+ if ( cmd2 == cmd1 )
+ continue;
+ if ( cmd2->cmd == LC_SEGMENT_COMMAND ) {
+ struct macho_segment_command* segCmd2 = (struct macho_segment_command*)cmd2;
+ uintptr_t vmStart2 = segCmd2->vmaddr;
+ uintptr_t vmEnd2 = segCmd2->vmaddr + segCmd2->vmsize;
+ uintptr_t fileStart2 = segCmd2->fileoff;
+ uintptr_t fileEnd2 = segCmd2->fileoff + segCmd2->filesize;
+ if ( ((vmStart2 <= vmStart1) && (vmEnd2 > vmStart1) && (vmEnd1 > vmStart1))
+ || ((vmStart2 >= vmStart1) && (vmStart2 < vmEnd1) && (vmEnd2 > vmStart2)) )
+ dyld::throwf("malformed mach-o image: segment %s vm overlaps segment %s", segCmd1->segname, segCmd2->segname);
+ if ( ((fileStart2 <= fileStart1) && (fileEnd2 > fileStart1) && (fileEnd1 > fileStart1))
+ || ((fileStart2 >= fileStart1) && (fileStart2 < fileEnd1) && (fileEnd2 > fileStart2)) )
+ dyld::throwf("malformed mach-o image: segment %s file content overlaps segment %s", segCmd1->segname, segCmd2->segname);
}
- break;
+ cmd2 = (const struct load_command*)(((char*)cmd2)+cmd2->cmdsize);
+ }
}
- cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
- }
- }
-
+ cmd1 = (const struct load_command*)(((char*)cmd1)+cmd1->cmdsize);
+ }
+
+ if (lastFileStart != linkeditFileStart)
+ dyld::throwf("malformed mach-o image: __LINKEDIT must be last segment");
+ }
+
// fSegmentsArrayCount is only 8-bits
if ( *segCount > 255 )
dyld::throwf("malformed mach-o image: more than 255 segments in %s", path);
-
+
// fSegmentsArrayCount is only 8-bits
if ( *libCount > 4095 )
dyld::throwf("malformed mach-o image: more than 4095 dependent libraries in %s", path);
@@ -228,7 +308,8 @@
unsigned int segCount;
unsigned int libCount;
const linkedit_data_command* codeSigCmd;
- sniffLoadCommands(mh, path, &compressed, &segCount, &libCount, context, &codeSigCmd);
+ const encryption_info_command* encryptCmd;
+ sniffLoadCommands(mh, path, false, &compressed, &segCount, &libCount, context, &codeSigCmd, &encryptCmd);
// instantiate concrete class based on content of load commands
if ( compressed )
return ImageLoaderMachOCompressed::instantiateMainExecutable(mh, slide, path, segCount, libCount, context);
@@ -260,13 +341,14 @@
unsigned int segCount;
unsigned int libCount;
const linkedit_data_command* codeSigCmd;
- sniffLoadCommands((const macho_header*)fileData, path, &compressed, &segCount, &libCount, context, &codeSigCmd);
+ const encryption_info_command* encryptCmd;
+ sniffLoadCommands((const macho_header*)fileData, path, false, &compressed, &segCount, &libCount, context, &codeSigCmd, &encryptCmd);
// instantiate concrete class based on content of load commands
if ( compressed )
- return ImageLoaderMachOCompressed::instantiateFromFile(path, fd, fileData, offsetInFat, lenInFat, info, segCount, libCount, codeSigCmd, context);
+ return ImageLoaderMachOCompressed::instantiateFromFile(path, fd, fileData, dataSize, offsetInFat, lenInFat, info, segCount, libCount, codeSigCmd, encryptCmd, context);
else
#if SUPPORT_CLASSIC_MACHO
- return ImageLoaderMachOClassic::instantiateFromFile(path, fd, fileData, offsetInFat, lenInFat, info, segCount, libCount, codeSigCmd, context);
+ return ImageLoaderMachOClassic::instantiateFromFile(path, fd, fileData, dataSize, offsetInFat, lenInFat, info, segCount, libCount, codeSigCmd, context);
#else
throw "missing LC_DYLD_INFO load command";
#endif
@@ -280,7 +362,8 @@
unsigned int segCount;
unsigned int libCount;
const linkedit_data_command* codeSigCmd;
- sniffLoadCommands(mh, path, &compressed, &segCount, &libCount, context, &codeSigCmd);
+ const encryption_info_command* encryptCmd;
+ sniffLoadCommands(mh, path, true, &compressed, &segCount, &libCount, context, &codeSigCmd, &encryptCmd);
// instantiate concrete class based on content of load commands
if ( compressed )
return ImageLoaderMachOCompressed::instantiateFromCache(mh, path, slide, info, segCount, libCount, context);
@@ -299,7 +382,8 @@
unsigned int segCount;
unsigned int libCount;
const linkedit_data_command* sigcmd;
- sniffLoadCommands(mh, moduleName, &compressed, &segCount, &libCount, context, &sigcmd);
+ const encryption_info_command* encryptCmd;
+ sniffLoadCommands(mh, moduleName, false, &compressed, &segCount, &libCount, context, &sigcmd, &encryptCmd);
// instantiate concrete class based on content of load commands
if ( compressed )
return ImageLoaderMachOCompressed::instantiateFromMemory(moduleName, mh, len, segCount, libCount, context);
@@ -328,16 +412,19 @@
}
-void ImageLoaderMachO::parseLoadCmds()
+void ImageLoaderMachO::parseLoadCmds(const LinkContext& context)
{
// now that segments are mapped in, get real fMachOData, fLinkEditBase, and fSlide
for(unsigned int i=0; i < fSegmentsCount; ++i) {
// set up pointer to __LINKEDIT segment
- if ( strcmp(segName(i),"__LINKEDIT") == 0 )
+ if ( strcmp(segName(i),"__LINKEDIT") == 0 ) {
+ if ( context.codeSigningEnforced && (segFileOffset(i) > fCoveredCodeLength))
+ dyld::throwf("cannot load '%s' (segment outside of code signature)", this->getShortName());
fLinkEditBase = (uint8_t*)(segActualLoadAddress(i) - segFileOffset(i));
+ }
#if TEXT_RELOC_SUPPORT
// __TEXT segment always starts at beginning of file and contains mach_header and load commands
- if ( strcmp(segName(i),"__TEXT") == 0 ) {
+ if ( segExecutable(i) ) {
if ( segHasRebaseFixUps(i) && (fSlide != 0) )
fTextSegmentRebases = true;
if ( segHasBindFixUps(i) )
@@ -419,9 +506,9 @@
else if ( type == S_DTRACE_DOF )
fHasDOFSections = true;
else if ( isTextSeg && (strcmp(sect->sectname, "__eh_frame") == 0) )
- fEHFrameSectionOffset = (uint8_t*)sect - fMachOData;
+ fEHFrameSectionOffset = (uint32_t)((uint8_t*)sect - fMachOData);
else if ( isTextSeg && (strcmp(sect->sectname, "__unwind_info") == 0) )
- fUnwindInfoSectionOffset = (uint8_t*)sect - fMachOData;;
+ fUnwindInfoSectionOffset = (uint32_t)((uint8_t*)sect - fMachOData);
}
}
break;
@@ -430,7 +517,7 @@
break;
case LC_ID_DYLIB:
{
- fDylibIDOffset = (uint8_t*)cmd - fMachOData;
+ fDylibIDOffset = (uint32_t)((uint8_t*)cmd - fMachOData);
}
break;
case LC_RPATH:
@@ -442,6 +529,8 @@
break;
case LC_VERSION_MIN_MACOSX:
case LC_VERSION_MIN_IPHONEOS:
+ case LC_VERSION_MIN_TVOS:
+ case LC_VERSION_MIN_WATCHOS:
minOSVersionCmd = (version_min_command*)cmd;
break;
default:
@@ -582,6 +671,7 @@
bool ImageLoaderMachO::segHasRebaseFixUps(unsigned int segIndex) const
{
+#if TEXT_RELOC_SUPPORT
// scan sections for fix-up bit
const macho_segment_command* segCmd = segLoadCommand(segIndex);
const struct macho_section* const sectionsStart = (struct macho_section*)((char*)segCmd + sizeof(struct macho_segment_command));
@@ -590,11 +680,13 @@
if ( (sect->flags & S_ATTR_LOC_RELOC) != 0 )
return true;
}
+#endif
return false;
}
bool ImageLoaderMachO::segHasBindFixUps(unsigned int segIndex) const
{
+#if TEXT_RELOC_SUPPORT
// scan sections for fix-up bit
const macho_segment_command* segCmd = segLoadCommand(segIndex);
const struct macho_section* const sectionsStart = (struct macho_section*)((char*)segCmd + sizeof(struct macho_segment_command));
@@ -603,6 +695,7 @@
if ( (sect->flags & S_ATTR_EXT_RELOC) != 0 )
return true;
}
+#endif
return false;
}
@@ -652,7 +745,7 @@
// prefetch writable segment that have mmap'ed regions
radvisory advice;
advice.ra_offset = offsetInFat + segFileOffset(i);
- advice.ra_count = segFileSize(i);
+ advice.ra_count = (int)segFileSize(i);
// limit prefetch to 1MB (256 pages)
if ( advice.ra_count > 1024*1024 )
advice.ra_count = 1024*1024;
@@ -779,6 +872,8 @@
dyld::throwf("required code signature missing for '%s'\n", this->getPath());
}
#endif
+ //Since we don't have a range for the signature we have to assume full coverage
+ fCoveredCodeLength = UINT64_MAX;
}
else {
#if __MAC_OS_X_VERSION_MIN_REQUIRED
@@ -791,15 +886,54 @@
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);
+ int result = fcntl(fd, F_ADDFILESIGS_RETURN, &siginfo);
+
+#if TARGET_IPHONE_SIMULATOR
+ // rdar://problem/18759224> check range covered by the code directory after loading
+ // Attempt to fallback only if we are in the simulator
+
+ if ( result == -1 ) {
+ result = fcntl(fd, F_ADDFILESIGS, &siginfo);
+ siginfo.fs_file_start = codeSigCmd->dataoff;
+ }
+#endif
+
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);
+ siginfo.fs_file_start = UINT64_MAX;
+ } else if ( context.verboseCodeSignatures ) {
+ dyld::log("dyld: Registered code signature for %s\n", this->getPath());
+ }
+ fCoveredCodeLength = siginfo.fs_file_start;
+ }
+}
+
+void ImageLoaderMachO::validateFirstPages(const struct linkedit_data_command* codeSigCmd, int fd, const uint8_t *fileData, size_t lenFileData, off_t offsetInFat, const LinkContext& context)
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
+ // rdar://problem/21839703> 15A226d: dyld crashes in mageLoaderMachO::validateFirstPages during dlopen() after encountering an mmap failure
+ // We need to ignore older code signatures because they will be bad.
+ if ( this->sdkVersion() < DYLD_MACOSX_VERSION_10_9 ) {
+ return;
+ }
+#endif
+ if (codeSigCmd != NULL) {
+ if ( context.verboseMapping )
+ dyld::log("dyld: validate pages: %llu\n", (unsigned long long)offsetInFat);
+
+ void *fdata = xmmap(NULL, lenFileData, PROT_READ | PROT_EXEC, MAP_SHARED, fd, offsetInFat);
+ if ( fdata == MAP_FAILED ) {
+ if ( context.processRequiresLibraryValidation )
+ dyld::throwf("cannot load image with wrong team ID in process using Library Validation");
else
- dyld::log("dyld: Registered code signature for %s\n", this->getPath());
- }
+ dyld::throwf("mmap() errno=%d validating first page of '%s'", errno, getInstallPath());
+ }
+ if ( memcmp(fdata, fileData, lenFileData) != 0 )
+ dyld::throwf("mmap() page compare failed for '%s'", getInstallPath());
+ munmap(fdata, lenFileData);
}
}
@@ -830,14 +964,16 @@
for (const struct macho_section* sect=sectionsStart; sect < sectionsEnd; ++sect) {
if ( ((sect->flags & SECTION_TYPE) == S_INTERPOSING) || ((strcmp(sect->sectname, "__interpose") == 0) && (strcmp(seg->segname, "__DATA") == 0)) ) {
const InterposeData* interposeArray = (InterposeData*)(sect->addr + fSlide);
- const unsigned int count = sect->size / sizeof(InterposeData);
- for (uint32_t i=0; i < count; ++i) {
+ const size_t count = sect->size / sizeof(InterposeData);
+ for (size_t i=0; i < count; ++i) {
ImageLoader::InterposeTuple tuple;
tuple.replacement = interposeArray[i].replacement;
- tuple.replacementImage = this;
+ tuple.neverImage = this;
+ tuple.onlyImage = NULL;
tuple.replacee = interposeArray[i].replacee;
// <rdar://problem/7937695> verify that replacement is in this image
if ( this->containsAddress((void*)tuple.replacement) ) {
+ // chain to any existing interpositions
for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
if ( it->replacee == tuple.replacee ) {
tuple.replacee = it->replacement;
@@ -865,6 +1001,8 @@
switch ( cmd->cmd ) {
case LC_VERSION_MIN_MACOSX:
case LC_VERSION_MIN_IPHONEOS:
+ case LC_VERSION_MIN_TVOS:
+ case LC_VERSION_MIN_WATCHOS:
versCmd = (version_min_command*)cmd;
return versCmd->sdk;
}
@@ -872,6 +1010,32 @@
}
return 0;
}
+
+uint32_t ImageLoaderMachO::minOSVersion(const mach_header* mh)
+{
+ const uint32_t cmd_count = mh->ncmds;
+ const struct load_command* const cmds = (struct load_command*)(((char*)mh) + 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:
+ case LC_VERSION_MIN_TVOS:
+ case LC_VERSION_MIN_WATCHOS:
+ versCmd = (version_min_command*)cmd;
+ return versCmd->version;
+ }
+ cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
+ }
+ return 0;
+}
+
+uint32_t ImageLoaderMachO::minOSVersion() const
+{
+ return ImageLoaderMachO::minOSVersion(machHeader());
+}
+
void* ImageLoaderMachO::getThreadPC() const
{
@@ -911,6 +1075,9 @@
void* entry = (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);
+ #elif __arm64__
+ const arm_thread_state64_t* registers = (arm_thread_state64_t*)(((char*)cmd) + 16);
void* entry = (void*)(registers->__pc + fSlide);
#else
#warning need processor specific code
@@ -1034,8 +1201,8 @@
case LC_RPATH:
const char* pathToAdd = NULL;
const char* path = (char*)cmd + ((struct rpath_command*)cmd)->path.offset;
- if ( strncmp(path, "@loader_path/", 13) == 0 ) {
- if ( context.processIsRestricted && (context.mainExecutable == this) ) {
+ if ( (strncmp(path, "@loader_path", 12) == 0) && ((path[12] == '/') || (path[12] == '\0')) ) {
+ if ( context.processIsRestricted && !context.processRequiresLibraryValidation && (context.mainExecutable == this) ) {
dyld::warn("LC_RPATH %s in %s being ignored in restricted program because of @loader_path\n", path, this->getPath());
break;
}
@@ -1044,15 +1211,14 @@
char newRealPath[strlen(resolvedPath) + strlen(path)];
strcpy(newRealPath, resolvedPath);
char* addPoint = strrchr(newRealPath,'/');
- if ( addPoint != NULL )
- strcpy(&addPoint[1], &path[13]);
- else
- strcpy(newRealPath, &path[13]);
- pathToAdd = strdup(newRealPath);
+ if ( addPoint != NULL ) {
+ strcpy(addPoint, &path[12]);
+ pathToAdd = strdup(newRealPath);
+ }
}
}
- else if ( strncmp(path, "@executable_path/", 17) == 0 ) {
- if ( context.processIsRestricted ) {
+ else if ( (strncmp(path, "@executable_path", 16) == 0) && ((path[16] == '/') || (path[16] == '\0')) ) {
+ if ( context.processIsRestricted && !context.processRequiresLibraryValidation ) {
dyld::warn("LC_RPATH %s in %s being ignored in restricted program because of @executable_path\n", path, this->getPath());
break;
}
@@ -1061,14 +1227,13 @@
char newRealPath[strlen(resolvedPath) + strlen(path)];
strcpy(newRealPath, resolvedPath);
char* addPoint = strrchr(newRealPath,'/');
- if ( addPoint != NULL )
- strcpy(&addPoint[1], &path[17]);
- else
- strcpy(newRealPath, &path[17]);
- pathToAdd = strdup(newRealPath);
+ if ( addPoint != NULL ) {
+ strcpy(addPoint, &path[16]);
+ pathToAdd = strdup(newRealPath);
+ }
}
}
- else if ( (path[0] != '/') && context.processIsRestricted ) {
+ else if ( (path[0] != '/') && context.processIsRestricted && !context.processRequiresLibraryValidation ) {
dyld::warn("LC_RPATH %s in %s being ignored in restricted program because it is a relative path\n", path, this->getPath());
break;
}
@@ -1105,6 +1270,7 @@
}
}
+
bool ImageLoaderMachO::getUUID(uuid_t uuid) const
{
const uint32_t cmd_count = ((macho_header*)fMachOData)->ncmds;
@@ -1184,24 +1350,21 @@
#if TEXT_RELOC_SUPPORT
void ImageLoaderMachO::makeTextSegmentWritable(const LinkContext& context, bool writeable)
{
- int textSegmentIndex = 0;
for(unsigned int i=0; i < fSegmentsCount; ++i) {
- if ( strcmp(segName(i), "__TEXT") == 0 ) {
- textSegmentIndex = i;
- break;
- }
- }
-
- if ( writeable ) {
- segMakeWritable(textSegmentIndex, context);
- }
- else {
- #if !__i386__ && !__x86_64__
- // some processors require range to be invalidated before it is made executable
- sys_icache_invalidate((void*)segActualLoadAddress(textSegmentIndex), segSize(textSegmentIndex));
- #endif
- segProtect(textSegmentIndex, context);
- }
+ if ( segExecutable(i) ) {
+ if ( writeable ) {
+ segMakeWritable(i, context);
+ }
+ else {
+ #if !__i386__ && !__x86_64__
+ // some processors require range to be invalidated before it is made executable
+ sys_icache_invalidate((void*)segActualLoadAddress(i), segSize(textSegmentIndex));
+ #endif
+ segProtect(i, context);
+ }
+ }
+ }
+
}
#endif
@@ -1242,16 +1405,7 @@
{
uintptr_t result = exportedSymbolAddress(context, sym, requestor, runResolver);
// check for interposing overrides
- for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
- // replace all references to 'replacee' with 'replacement'
- if ( (result == it->replacee) && (requestor != it->replacementImage) ) {
- if ( context.verboseInterposing ) {
- dyld::log("dyld interposing: replace 0x%lX with 0x%lX in %s\n",
- it->replacee, it->replacement, this->getPath());
- }
- result = it->replacement;
- }
- }
+ result = interposedAddress(context, result, requestor);
return result;
}
@@ -1390,11 +1544,13 @@
void __attribute__((noreturn)) ImageLoaderMachO::throwSymbolNotFound(const LinkContext& context, const char* symbol,
- const char* referencedFrom, const char* expectedIn)
+ const char* referencedFrom, const char* fromVersMismatch,
+ const char* expectedIn)
{
// record values for possible use by CrashReporter or Finder
(*context.setErrorStrings)(dyld_error_kind_symbol_missing, referencedFrom, expectedIn, symbol);
- dyld::throwf("Symbol not found: %s\n Referenced from: %s\n Expected in: %s\n", symbol, referencedFrom, expectedIn);
+ dyld::throwf("Symbol not found: %s\n Referenced from: %s%s\n Expected in: %s\n",
+ symbol, referencedFrom, fromVersMismatch, expectedIn);
}
const mach_header* ImageLoaderMachO::machHeader() const
@@ -1462,7 +1618,7 @@
break;
case BIND_TYPE_TEXT_PCREL32:
loc32 = (uint32_t*)locationToFix;
- value32 = (uint32_t)newValue - (((uintptr_t)locationToFix) + 4);
+ value32 = (uint32_t)(newValue - (((uintptr_t)locationToFix) + 4));
if ( *loc32 != value32 )
*loc32 = value32;
break;
@@ -1488,7 +1644,7 @@
#endif
struct DATAdyld {
- void* dyldLazyBinder; // filled in at launch by dyld to point into dyld to &stub_binding_helper_interface
+ void* dyldLazyBinder; // filled in at launch by dyld to point into dyld to &stub_binding_helper
void* dyldFuncLookup; // filled in at launch by dyld to point into dyld to &_dyld_func_lookup
// the following only exist in main executables built for 10.5 or later
ProgramVars vars;
@@ -1496,7 +1652,6 @@
// These are defined in dyldStartup.s
extern "C" void stub_binding_helper();
-extern "C" bool dyld_func_lookup(const char* name, uintptr_t* address);
void ImageLoaderMachO::setupLazyPointerHandler(const LinkContext& context)
@@ -1513,19 +1668,21 @@
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;
- if ( strcmp(seg->segname, "__DATA") == 0 ) {
+ if ( strncmp(seg->segname, "__DATA", 6) == 0 ) {
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) {
if ( strcmp(sect->sectname, "__dyld" ) == 0 ) {
struct DATAdyld* dd = (struct DATAdyld*)(sect->addr + fSlide);
+ #if !__arm64__ && !__ARM_ARCH_7K__
if ( sect->size > offsetof(DATAdyld, dyldLazyBinder) ) {
if ( dd->dyldLazyBinder != (void*)&stub_binding_helper )
dd->dyldLazyBinder = (void*)&stub_binding_helper;
}
+ #endif // !__arm64__
if ( sect->size > offsetof(DATAdyld, dyldFuncLookup) ) {
- if ( dd->dyldFuncLookup != (void*)&dyld_func_lookup )
- dd->dyldFuncLookup = (void*)&dyld_func_lookup;
+ if ( dd->dyldFuncLookup != (void*)&_dyld_func_lookup )
+ dd->dyldFuncLookup = (void*)&_dyld_func_lookup;
}
if ( mh->filetype == MH_EXECUTE ) {
// there are two ways to get the program variables
@@ -1670,8 +1827,8 @@
const uint8_t type = sect->flags & SECTION_TYPE;
if ( type == S_MOD_INIT_FUNC_POINTERS ) {
Initializer* inits = (Initializer*)(sect->addr + fSlide);
- const uint32_t count = sect->size / sizeof(uintptr_t);
- for (uint32_t i=0; i < count; ++i) {
+ const size_t count = sect->size / sizeof(uintptr_t);
+ for (size_t i=0; i < count; ++i) {
Initializer func = inits[i];
// <rdar://problem/8543820&9228031> verify initializers are in image
if ( ! this->containsAddress((void*)func) ) {
@@ -1766,8 +1923,8 @@
const uint8_t type = sect->flags & SECTION_TYPE;
if ( type == S_MOD_TERM_FUNC_POINTERS ) {
Terminator* terms = (Terminator*)(sect->addr + fSlide);
- const uint32_t count = sect->size / sizeof(uintptr_t);
- for (uint32_t i=count; i > 0; --i) {
+ const size_t count = sect->size / sizeof(uintptr_t);
+ for (size_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) ) {
@@ -1808,7 +1965,13 @@
uintptr_t highAddr = 0;
for(unsigned int i=0, e=segmentCount(); i < e; ++i) {
const uintptr_t segLow = segPreferredLoadAddress(i);
- const uintptr_t segHigh = (segLow + segSize(i) + 4095) & -4096;
+ const uintptr_t segHigh = dyld_page_round(segLow + segSize(i));
+ if ( segLow < highAddr ) {
+ if ( dyld_page_size > 4096 )
+ dyld::throwf("can't map segments into 16KB pages");
+ else
+ dyld::throwf("overlapping segments");
+ }
if ( segLow < lowAddr )
lowAddr = segLow;
if ( segHigh > highAddr )
@@ -1845,7 +2008,7 @@
// in PIE programs, load initial dylibs after main executable so they don't have fixed addresses either
if ( fgNextPIEDylibAddress != 0 ) {
// add small (0-3 pages) random padding between dylibs
- addr = fgNextPIEDylibAddress + (__stack_chk_guard/fgNextPIEDylibAddress & (sizeof(long)-1))*4096;
+ addr = fgNextPIEDylibAddress + (__stack_chk_guard/fgNextPIEDylibAddress & (sizeof(long)-1))*dyld_page_size;
//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));
if ( r == KERN_SUCCESS ) {
@@ -1877,8 +2040,12 @@
{
// find address range for image
intptr_t slide = this->assignSegmentAddresses(context);
- if ( context.verboseMapping )
- dyld::log("dyld: Mapping %s\n", this->getPath());
+ if ( context.verboseMapping ) {
+ if ( offsetInFat != 0 )
+ dyld::log("dyld: Mapping %s (slice offset=%llu)\n", this->getPath(), (unsigned long long)offsetInFat);
+ else
+ dyld::log("dyld: Mapping %s\n", this->getPath());
+ }
// map in all segments
for(unsigned int i=0, e=segmentCount(); i < e; ++i) {
vm_offset_t fileOffset = segFileOffset(i) + offsetInFat;
@@ -1888,7 +2055,6 @@
if ( !segUnaccessible(i) ) {
// If has text-relocs, don't set x-bit initially.
// Instead set it later after text-relocs have been done.
- // The iPhone OS does not like it when you make executable code writable.
if ( segExecutable(i) && !(segHasRebaseFixUps(i) && (slide != 0)) )
protection |= PROT_EXEC;
if ( segReadable(i) )