Loading...
--- dyld/dyld-655.1.1/src/ImageLoaderMachO.cpp
+++ dyld/dyld-421.2/src/ImageLoaderMachO.cpp
@@ -46,17 +46,12 @@
#include <stdint.h>
#include <System/sys/codesign.h>
-#if __has_feature(ptrauth_calls)
-#include <ptrauth.h>
-#endif
-
#include "ImageLoaderMachO.h"
#include "ImageLoaderMachOCompressed.h"
#if SUPPORT_CLASSIC_MACHO
#include "ImageLoaderMachOClassic.h"
#endif
#include "mach-o/dyld_images.h"
-#include "Tracing.h"
#include "dyld.h"
// <rdar://problem/8718137> use stack guard random value to add padding between dylibs
@@ -74,43 +69,12 @@
#define LC_VERSION_MIN_WATCHOS 0x30
#endif
-#ifndef LC_BUILD_VERSION
- #define LC_BUILD_VERSION 0x32 /* build for platform min OS version */
-
- /*
- * The build_version_command contains the min OS version on which this
- * binary was built to run for its platform. The list of known platforms and
- * tool values following it.
- */
- struct build_version_command {
- uint32_t cmd; /* LC_BUILD_VERSION */
- uint32_t cmdsize; /* sizeof(struct build_version_command) plus */
- /* ntools * sizeof(struct build_tool_version) */
- uint32_t platform; /* platform */
- uint32_t minos; /* X.Y.Z is encoded in nibbles xxxx.yy.zz */
- uint32_t sdk; /* X.Y.Z is encoded in nibbles xxxx.yy.zz */
- uint32_t ntools; /* number of tool entries following this */
- };
-
- struct build_tool_version {
- uint32_t tool; /* enum for the tool */
- uint32_t version; /* version number of the tool */
- };
-
- /* Known values for the platform field above. */
- #define PLATFORM_MACOS 1
- #define PLATFORM_IOS 2
- #define PLATFORM_TVOS 3
- #define PLATFORM_WATCHOS 4
- #define PLATFORM_BRIDGEOS 5
-
- /* Known values for the tool field above. */
- #define TOOL_CLANG 1
- #define TOOL_SWIFT 2
- #define TOOL_LD 3
-#endif
-
-#define LIBSYSTEM_DYLIB_PATH "/usr/lib/libSystem.B.dylib"
+
+#if TARGET_IPHONE_SIMULATOR
+ #define LIBSYSTEM_DYLIB_PATH "/usr/lib/libSystem.dylib"
+#else
+ #define LIBSYSTEM_DYLIB_PATH "/usr/lib/libSystem.B.dylib"
+#endif
// relocation_info.r_length field has value 3 for 64-bit executables and value 2 for 32-bit executables
#if __LP64__
@@ -145,7 +109,7 @@
fReadOnlyImportSegment(false),
#endif
fHasSubLibraries(false), fHasSubUmbrella(false), fInUmbrella(false), fHasDOFSections(false), fHasDashInit(false),
- fHasInitializers(false), fHasTerminators(false), fNotifyObjC(false), fRetainForObjC(false), fRegisteredAsRequiresCoalescing(false), fOverrideOfCacheImageNum(0)
+ fHasInitializers(false), fHasTerminators(false), fNotifyObjC(false), fRetainForObjC(false), fRegisteredAsRequiresCoalescing(false)
{
fIsSplitSeg = ((mh->flags & MH_SPLIT_SEGS) != 0);
@@ -260,7 +224,7 @@
if ( (segCmd->initprot != 0) && ((segCmd->initprot & VM_PROT_READ) == 0) )
dyld::throwf("malformed mach-o image: %s segment is not mapped readable", segCmd->segname);
}
- if ( (segCmd->fileoff == 0) && (segCmd->filesize != 0) ) {
+ if ( (segCmd->fileoff == 0) && (segCmd->filesize != 0) ) {
if ( (segCmd->initprot & VM_PROT_READ) == 0 )
dyld::throwf("malformed mach-o image: %s segment maps start of file but is not readable", segCmd->segname);
if ( (segCmd->initprot & VM_PROT_WRITE) == VM_PROT_WRITE ) {
@@ -381,8 +345,7 @@
case LC_VERSION_MIN_WATCHOS:
case LC_VERSION_MIN_TVOS:
case LC_VERSION_MIN_IPHONEOS:
- if ( !context.marzipan )
- throw "mach-o, but built for simulator (not macOS)";
+ throw "mach-o, but built for simulator (not macOS)";
break;
#endif
}
@@ -393,7 +356,7 @@
throw "load commands not in a segment";
if ( linkeditSegCmd == NULL )
throw "malformed mach-o image: missing __LINKEDIT segment";
- if ( !inCache && (startOfFileSegCmd == NULL) )
+ if ( startOfFileSegCmd == NULL )
throw "malformed mach-o image: missing __TEXT segment that maps start of file";
// <rdar://problem/13145644> verify every segment does not overlap another segment
if ( context.strictMachORequired ) {
@@ -503,7 +466,7 @@
if ( symTabCmd != NULL ) {
// validate symbol table fits in LINKEDIT
- if ( (symTabCmd->nsyms > 0) && (symTabCmd->symoff < linkeditFileOffsetStart) )
+ if ( symTabCmd->symoff < linkeditFileOffsetStart )
throw "malformed mach-o image: symbol table underruns __LINKEDIT";
if ( symTabCmd->nsyms > 0x10000000 )
throw "malformed mach-o image: symbol table too large";
@@ -672,11 +635,8 @@
for(unsigned int i=0; i < fSegmentsCount; ++i) {
// set up pointer to __LINKEDIT segment
if ( strcmp(segName(i),"__LINKEDIT") == 0 ) {
- #if !__MAC_OS_X_VERSION_MIN_REQUIRED
- // <rdar://problem/42419336> historically, macOS never did this check
- if ( segFileOffset(i) > fCoveredCodeLength )
+ if ( context.requireCodeSignature && (segFileOffset(i) > fCoveredCodeLength))
dyld::throwf("cannot load '%s' (segment outside of code signature)", this->getShortName());
- #endif
fLinkEditBase = (uint8_t*)(segActualLoadAddress(i) - segFileOffset(i));
}
#if TEXT_RELOC_SUPPORT
@@ -1136,22 +1096,24 @@
void ImageLoaderMachO::loadCodeSignature(const struct linkedit_data_command* codeSigCmd, int fd, uint64_t offsetInFatFile, const LinkContext& context)
{
- dyld3::ScopedTimer(DBG_DYLD_TIMING_ATTACH_CODESIGNATURE, 0, 0, 0);
// if dylib being loaded has no code signature load command
if ( codeSigCmd == NULL) {
- disableCoverageCheck();
+ if (context.requireCodeSignature ) {
+ // if we require dylibs to be codesigned there needs to be a signature.
+ dyld::throwf("required code signature missing for '%s'\n", this->getPath());
+ } else {
+ disableCoverageCheck();
+ }
}
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 ) {
- disableCoverageCheck();
return;
}
#endif
-
fsignatures_t siginfo;
- siginfo.fs_file_start=offsetInFatFile; // start of mach-o slice in fat file
+ 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_RETURN, &siginfo);
@@ -1169,26 +1131,28 @@
if ( result == -1 ) {
if ( (errno == EPERM) || (errno == EBADEXEC) )
dyld::throwf("code signature invalid for '%s'\n", this->getPath());
- if ( context.verboseCodeSignatures )
+ 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;
- }
-
- {
- fchecklv checkInfo;
- char messageBuffer[512];
- messageBuffer[0] = '\0';
- checkInfo.lv_file_start = offsetInFatFile;
- checkInfo.lv_error_message_size = sizeof(messageBuffer);
- checkInfo.lv_error_message = messageBuffer;
- int res = fcntl(fd, F_CHECK_LV, &checkInfo);
- if ( res == -1 ) {
- dyld::throwf("code signature in (%s) not valid for use in process using Library Validation: %s", this->getPath(), messageBuffer);
- }
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
+ if ( context.processUsingLibraryValidation ) {
+ fchecklv checkInfo;
+ char messageBuffer[512];
+ messageBuffer[0] = '\0';
+ checkInfo.lv_file_start = offsetInFatFile;
+ checkInfo.lv_error_message_size = sizeof(messageBuffer);
+ checkInfo.lv_error_message = messageBuffer;
+ int res = fcntl(fd, F_CHECK_LV, &checkInfo);
+ if ( res == -1 ) {
+ dyld::throwf("code signature in (%s) not valid for use in process using Library Validation: %s", this->getPath(), messageBuffer);
+ }
+ }
+#endif
}
}
@@ -1202,17 +1166,25 @@
}
#endif
if (codeSigCmd != NULL) {
- void *fdata = xmmap(NULL, lenFileData, PROT_READ, MAP_SHARED, fd, offsetInFat);
+ void *fdata = xmmap(NULL, lenFileData, PROT_READ | PROT_EXEC, MAP_SHARED, fd, offsetInFat);
if ( fdata == MAP_FAILED ) {
- int errnoCopy = errno;
- if ( errnoCopy == EPERM ) {
- if ( dyld::sandboxBlockedMmap(getPath()) )
- dyld::throwf("file system sandbox blocked mmap() of '%s'", getPath());
- else
- dyld::throwf("code signing blocked mmap() of '%s'", getPath());
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
+ if ( context.processUsingLibraryValidation ) {
+ dyld::throwf("cannot load image with wrong team ID in process using Library Validation");
}
else
- dyld::throwf("mmap() errno=%d validating first page of '%s'", errnoCopy, getPath());
+#endif
+ {
+ int errnoCopy = errno;
+ if ( errnoCopy == EPERM ) {
+ if ( dyld::sandboxBlockedMmap(getPath()) )
+ dyld::throwf("file system sandbox blocked mmap() of '%s'", getPath());
+ else
+ dyld::throwf("code signing blocked mmap() of '%s'", getPath());
+ }
+ else
+ dyld::throwf("mmap() errno=%d validating first page of '%s'", errnoCopy, getPath());
+ }
}
if ( memcmp(fdata, fileData, lenFileData) != 0 )
dyld::throwf("mmap() page compare failed for '%s'", getPath());
@@ -1230,7 +1202,7 @@
return NULL;
}
-void ImageLoaderMachO::registerInterposing(const LinkContext& context)
+void ImageLoaderMachO::registerInterposing()
{
// mach-o files advertise interposing by having a __DATA __interpose section
struct InterposeData { uintptr_t replacement; uintptr_t replacee; };
@@ -1286,7 +1258,6 @@
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;
- const struct build_version_command* buildVersCmd;
for (uint32_t i = 0; i < cmd_count; ++i) {
switch ( cmd->cmd ) {
case LC_VERSION_MIN_MACOSX:
@@ -1295,9 +1266,6 @@
case LC_VERSION_MIN_WATCHOS:
versCmd = (version_min_command*)cmd;
return versCmd->sdk;
- case LC_BUILD_VERSION:
- buildVersCmd = (build_version_command*)cmd;
- return buildVersCmd->sdk;
}
cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
}
@@ -1315,7 +1283,6 @@
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;
- const struct build_version_command* buildVersCmd;
for (uint32_t i = 0; i < cmd_count; ++i) {
switch ( cmd->cmd ) {
case LC_VERSION_MIN_MACOSX:
@@ -1324,9 +1291,6 @@
case LC_VERSION_MIN_WATCHOS:
versCmd = (version_min_command*)cmd;
return versCmd->version;
- case LC_BUILD_VERSION:
- buildVersCmd = (build_version_command*)cmd;
- return buildVersCmd->minos;
}
cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
}
@@ -1339,7 +1303,7 @@
}
-void* ImageLoaderMachO::getEntryFromLC_MAIN() const
+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)];
@@ -1360,33 +1324,36 @@
}
-void* ImageLoaderMachO::getEntryFromLC_UNIXTHREAD() const
+void* ImageLoaderMachO::getMain() 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_UNIXTHREAD ) {
- #if __i386__
- const i386_thread_state_t* registers = (i386_thread_state_t*)(((char*)cmd) + 16);
- void* entry = (void*)(registers->eip + fSlide);
- // <rdar://problem/8543820&9228031> verify entry point is in image
- if ( this->containsAddress(entry) )
- return entry;
- #elif __x86_64__
- const x86_thread_state64_t* registers = (x86_thread_state64_t*)(((char*)cmd) + 16);
- void* entry = (void*)(registers->rip + fSlide);
- // <rdar://problem/8543820&9228031> verify entry point is in image
- if ( this->containsAddress(entry) )
- return entry;
- #elif __arm64__ && !__arm64e__
- // temp support until <rdar://39514191> is fixed
- const uint64_t* regs64 = (uint64_t*)(((char*)cmd) + 16);
- void* entry = (void*)(regs64[32] + fSlide); // arm_thread_state64_t.__pc
- // <rdar://problem/8543820&9228031> verify entry point is in image
- if ( this->containsAddress(entry) )
- return entry;
- #endif
+ switch (cmd->cmd) {
+ case LC_UNIXTHREAD:
+ {
+ #if __i386__
+ const i386_thread_state_t* registers = (i386_thread_state_t*)(((char*)cmd) + 16);
+ void* entry = (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);
+ #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
+ #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);
}
@@ -1501,10 +1468,12 @@
const char* pathToAdd = NULL;
const char* path = (char*)cmd + ((struct rpath_command*)cmd)->path.offset;
if ( (strncmp(path, "@loader_path", 12) == 0) && ((path[12] == '/') || (path[12] == '\0')) ) {
- if ( !context.allowAtPaths && (context.mainExecutable == this) ) {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
+ if ( context.processIsRestricted && (context.mainExecutable == this) ) {
dyld::warn("LC_RPATH %s in %s being ignored in restricted program because of @loader_path\n", path, this->getPath());
break;
}
+#endif
char resolvedPath[PATH_MAX];
if ( realpath(this->getPath(), resolvedPath) != NULL ) {
char newRealPath[strlen(resolvedPath) + strlen(path)];
@@ -1517,10 +1486,12 @@
}
}
else if ( (strncmp(path, "@executable_path", 16) == 0) && ((path[16] == '/') || (path[16] == '\0')) ) {
- if ( !context.allowAtPaths) {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
+ if ( context.processIsRestricted ) {
dyld::warn("LC_RPATH %s in %s being ignored in restricted program because of @executable_path\n", path, this->getPath());
break;
}
+#endif
char resolvedPath[PATH_MAX];
if ( realpath(context.mainExecutable->getPath(), resolvedPath) != NULL ) {
char newRealPath[strlen(resolvedPath) + strlen(path)];
@@ -1532,10 +1503,12 @@
}
}
}
- else if ( (path[0] != '/') && !context.allowAtPaths) {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
+ else if ( (path[0] != '/') && context.processIsRestricted ) {
dyld::warn("LC_RPATH %s in %s being ignored in restricted program because it is a relative path\n", path, this->getPath());
break;
}
+#endif
#if SUPPORT_ROOT_PATH
else if ( (path[0] == '/') && (context.rootPaths != NULL) ) {
// <rdar://problem/5869973> DYLD_ROOT_PATH should apply to LC_RPATH rpaths
@@ -1596,10 +1569,6 @@
if ( fRetainForObjC )
this->setNeverUnload();
- // dylibs with thread local variables cannot be unloaded because there is no way to clean up all threads
- if ( !this->inSharedCache() && (this->machHeader()->flags & MH_HAS_TLV_DESCRIPTORS) )
- this->setNeverUnload();
-
// if prebound and loaded at prebound address, then no need to rebase
if ( this->usablePrebinding(context) ) {
// skip rebasing because prebinding is valid
@@ -1825,7 +1794,7 @@
for (uint32_t i = 0; i < cmd_count; ++i) {
if ( cmd->cmd == LC_SEGMENT_COMMAND ) {
const macho_segment_command* seg = (macho_segment_command*)cmd;
- if ( strcmp(seg->segname, "__TEXT") == 0 )
+ if ( (seg->fileoff == 0) && (seg->filesize != 0) )
return (char*)mh - (char*)(seg->vmaddr);
}
cmd = (const load_command*)(((char*)cmd)+cmd->cmdsize);
@@ -1861,7 +1830,7 @@
}
-const macho_section* ImageLoaderMachO::findSection(const void* imageInterior) const
+bool ImageLoaderMachO::findSection(const void* imageInterior, const char** segmentName, const char** sectionName, size_t* sectionOffset)
{
const uint32_t cmd_count = ((macho_header*)fMachOData)->ncmds;
const struct load_command* const cmds = (struct load_command*)&fMachOData[sizeof(macho_header)];
@@ -1877,7 +1846,13 @@
const struct macho_section* const sectionsEnd = §ionsStart[seg->nsects];
for (const struct macho_section* sect=sectionsStart; sect < sectionsEnd; ++sect) {
if ((sect->addr <= unslidInteriorAddress) && (unslidInteriorAddress < (sect->addr+sect->size))) {
- return sect;
+ if ( segmentName != NULL )
+ *segmentName = sect->segname;
+ if ( sectionName != NULL )
+ *sectionName = sect->sectname;
+ if ( sectionOffset != NULL )
+ *sectionOffset = unslidInteriorAddress - sect->addr;
+ return true;
}
}
}
@@ -1885,22 +1860,6 @@
break;
}
cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
- }
- return nullptr;
-}
-
-
-bool ImageLoaderMachO::findSection(const void* imageInterior, const char** segmentName, const char** sectionName, size_t* sectionOffset)
-{
- if (const struct macho_section* sect = findSection(imageInterior)) {
- const uintptr_t unslidInteriorAddress = (uintptr_t)imageInterior - this->getSlide();
- if ( segmentName != NULL )
- *segmentName = sect->segname;
- if ( sectionName != NULL )
- *sectionName = sect->sectname;
- if ( sectionOffset != NULL )
- *sectionOffset = unslidInteriorAddress - sect->addr;
- return true;
}
return false;
}
@@ -1970,29 +1929,24 @@
return (const void*)lastAddress;
}
-uintptr_t ImageLoaderMachO::bindLocation(const LinkContext& context, uintptr_t baseVMAddress,
- uintptr_t location, uintptr_t value,
- uint8_t type, const char* symbolName,
- intptr_t addend, const char* inPath, const char* toPath, const char* msg,
- ExtraBindData *extraBindData, uintptr_t slide)
-{
- auto logBind = [&]() {
- if ( !context.verboseBind )
- return;
- if ( addend != 0 ) {
- dyld::log("dyld: %sbind: %s:0x%08lX = %s:%s, *0x%08lX = 0x%08lX + %ld\n",
- msg, shortName(inPath), (uintptr_t)location,
- ((toPath != NULL) ? shortName(toPath) : "<missing weak_import>"),
- symbolName, (uintptr_t)location, value, addend);
- } else {
- dyld::log("dyld: %sbind: %s:0x%08lX = %s:%s, *0x%08lX = 0x%08lX\n",
- msg, shortName(inPath), (uintptr_t)location,
- ((toPath != NULL) ? shortName(toPath) : "<missing weak_import>"),
- symbolName, (uintptr_t)location, value);
- }
- };
-
-
+
+uintptr_t ImageLoaderMachO::bindLocation(const LinkContext& context, uintptr_t location, uintptr_t value,
+ uint8_t type, const char* symbolName,
+ intptr_t addend, const char* inPath, const char* toPath, const char* msg)
+{
+ // log
+ if ( context.verboseBind ) {
+ if ( addend != 0 )
+ dyld::log("dyld: %sbind: %s:0x%08lX = %s:%s, *0x%08lX = 0x%08lX + %ld\n",
+ msg, shortName(inPath), (uintptr_t)location,
+ ((toPath != NULL) ? shortName(toPath) : "<missing weak_import>"),
+ symbolName, (uintptr_t)location, value, addend);
+ else
+ dyld::log("dyld: %sbind: %s:0x%08lX = %s:%s, *0x%08lX = 0x%08lX\n",
+ msg, shortName(inPath), (uintptr_t)location,
+ ((toPath != NULL) ? shortName(toPath) : "<missing weak_import>"),
+ symbolName, (uintptr_t)location, value);
+ }
#if LOG_BINDINGS
// dyld::logBindings("%s: %s\n", targetImage->getShortName(), symbolName);
#endif
@@ -2004,45 +1958,22 @@
uint32_t value32;
switch (type) {
case BIND_TYPE_POINTER:
- logBind();
// test first so we don't needless dirty pages
if ( *locationToFix != newValue )
*locationToFix = newValue;
break;
- case BIND_TYPE_TEXT_ABSOLUTE32:
- logBind();
+ case BIND_TYPE_TEXT_ABSOLUTE32:
loc32 = (uint32_t*)locationToFix;
value32 = (uint32_t)newValue;
if ( *loc32 != value32 )
*loc32 = value32;
break;
- case BIND_TYPE_TEXT_PCREL32:
- logBind();
+ case BIND_TYPE_TEXT_PCREL32:
loc32 = (uint32_t*)locationToFix;
value32 = (uint32_t)(newValue - (((uintptr_t)locationToFix) + 4));
if ( *loc32 != value32 )
*loc32 = value32;
- break;
- case BIND_TYPE_THREADED_BIND:
- logBind();
- // test first so we don't needless dirty pages
- if ( *locationToFix != newValue )
- *locationToFix = newValue;
- break;
- case BIND_TYPE_THREADED_REBASE: {
- // Regular pointer which needs to fit in 51-bits of value.
- // C++ RTTI uses the top bit, so we'll allow the whole top-byte
- // and the signed-extended bottom 43-bits to be fit in to 51-bits.
- uint64_t top8Bits = *locationToFix & 0x0007F80000000000ULL;
- uint64_t bottom43Bits = *locationToFix & 0x000007FFFFFFFFFFULL;
- uint64_t targetValue = ( top8Bits << 13 ) | (((intptr_t)(bottom43Bits << 21) >> 21) & 0x00FFFFFFFFFFFFFF);
- newValue = (uintptr_t)(targetValue + slide);
- if ( context.verboseRebase ) {
- dyld::log("dyld: rebase: %s:*0x%08lX += 0x%08lX = 0x%08lX\n", shortName(inPath), (uintptr_t)locationToFix, slide, newValue);
- }
- *locationToFix = newValue;
break;
- }
default:
dyld::throwf("bad bind type %d", type);
}
@@ -2073,7 +2004,7 @@
// These are defined in dyldStartup.s
extern "C" void stub_binding_helper();
-extern "C" int _dyld_func_lookup(const char* name, void** address);
+
void ImageLoaderMachO::setupLazyPointerHandler(const LinkContext& context)
{
@@ -2101,24 +2032,6 @@
dd->dyldLazyBinder = (void*)&stub_binding_helper;
}
#endif // !__arm64__
- // <rdar://problem/40352925> Add work around for existing apps that have deprecated __dyld section
- const char* installNm = this->getInstallPath();
- if ( (mh->filetype != MH_DYLIB) || (installNm == NULL) || (strcmp(installNm, "/usr/lib/system/libdyld.dylib") != 0) ) {
- #if TARGET_OS_OSX
- // don't allow macOS apps build with 10.14 or later SDK and targeting 10.8 or later to have a __dyld section
- if ( (minOSVersion() >= 0x000a0800) && (sdkVersion() >= 0x000a0e00) )
- dyld::throwf("__dyld section not supported in %s", this->getPath());
- #endif
- #if TARGET_OS_IOS || TARGET_OS_TV
- // don't allow iOS apps build with 12.0 or later SDK to have a __dyld section
- if ( sdkVersion() >= 0x000c0000 )
- dyld::throwf("__dyld section not supported in %s", this->getPath());
- #endif
- #if TARGET_OS_WATCH
- if ( sdkVersion() >= 0x00050000 )
- dyld::throwf("__dyld section not supported in %s", this->getPath());
- #endif
- }
if ( sect->size > offsetof(DATAdyld, dyldFuncLookup) ) {
if ( dd->dyldFuncLookup != (void*)&_dyld_func_lookup )
dd->dyldFuncLookup = (void*)&_dyld_func_lookup;
@@ -2138,7 +2051,7 @@
// match what crt1.o supplies, then the program has a custom entry point.
// This means it might be doing something that needs to be executed before
// initializers are run.
- if ( memcmp(this->getEntryFromLC_UNIXTHREAD(), sStandardEntryPointInstructions, 16) != 0 ) {
+ if ( memcmp(this->getMain(), sStandardEntryPointInstructions, 16) != 0 ) {
if ( context.verboseInit )
dyld::log("dyld: program uses non-standard entry point so delaying running of initializers\n");
context.setRunInitialzersOldWay();
@@ -2208,10 +2121,7 @@
// if prebound and loaded at prebound address, and all libraries are same as when this was prebound, then no need to bind
if ( ((this->isPrebindable() && (this->getSlide() == 0)) || fInSharedCache)
&& this->usesTwoLevelNameSpace()
-#if !USES_CHAINED_BINDS
- && this->allDependentLibrariesAsWhenPreBound()
-#endif
- ) {
+ && this->allDependentLibrariesAsWhenPreBound() ) {
// allow environment variables to disable prebinding
if ( context.bindFlat )
return false;
@@ -2229,14 +2139,6 @@
return false;
}
-static void *stripPointer(void *ptr) {
-#if __has_feature(ptrauth_calls)
- return __builtin_ptrauth_strip(ptr, ptrauth_key_asia);
-#else
- return ptr;
-#endif
-}
-
void ImageLoaderMachO::doImageInit(const LinkContext& context)
{
@@ -2248,11 +2150,8 @@
switch (cmd->cmd) {
case LC_ROUTINES_COMMAND:
Initializer func = (Initializer)(((struct macho_routines_command*)cmd)->init_address + fSlide);
-#if __has_feature(ptrauth_calls)
- func = (Initializer)__builtin_ptrauth_sign_unauthenticated((void*)func, ptrauth_key_asia, 0);
-#endif
// <rdar://problem/8543820&9228031> verify initializers are in image
- if ( ! this->containsAddress(stripPointer((void*)func)) ) {
+ if ( ! this->containsAddress((void*)func) ) {
dyld::throwf("initializer function %p not in mapped image for %s\n", func, this->getPath());
}
if ( ! dyld::gProcessInfo->libSystemInitialized ) {
@@ -2261,10 +2160,7 @@
}
if ( context.verboseInit )
dyld::log("dyld: calling -init function %p in %s\n", func, this->getPath());
- {
- dyld3::ScopedTimer(DBG_DYLD_TIMING_STATIC_INITIALIZER, (uint64_t)fMachOData, (uint64_t)func, 0);
- func(context.argc, context.argv, context.envp, context.apple, &context.programVars);
- }
+ func(context.argc, context.argv, context.envp, context.apple, &context.programVars);
break;
}
cmd = (const struct load_command*)(((char*)cmd)+cmd->cmdsize);
@@ -2294,7 +2190,7 @@
for (size_t j=0; j < count; ++j) {
Initializer func = inits[j];
// <rdar://problem/8543820&9228031> verify initializers are in image
- if ( ! this->containsAddress(stripPointer((void*)func)) ) {
+ if ( ! this->containsAddress((void*)func) ) {
dyld::throwf("initializer function %p not in mapped image for %s\n", func, this->getPath());
}
if ( ! dyld::gProcessInfo->libSystemInitialized ) {
@@ -2306,10 +2202,7 @@
if ( context.verboseInit )
dyld::log("dyld: calling initializer function %p in %s\n", func, this->getPath());
bool haveLibSystemHelpersBefore = (dyld::gLibSystemHelpers != NULL);
- {
- dyld3::ScopedTimer(DBG_DYLD_TIMING_STATIC_INITIALIZER, (uint64_t)fMachOData, (uint64_t)func, 0);
- func(context.argc, context.argv, context.envp, context.apple, &context.programVars);
- }
+ func(context.argc, context.argv, context.envp, context.apple, &context.programVars);
bool haveLibSystemHelpersAfter = (dyld::gLibSystemHelpers != NULL);
if ( !haveLibSystemHelpersBefore && haveLibSystemHelpersAfter ) {
// now safe to use malloc() and other calls in libSystem.dylib
@@ -2407,11 +2300,8 @@
const size_t count = sect->size / sizeof(uintptr_t);
for (size_t j=count; j > 0; --j) {
Terminator func = terms[j-1];
-#if __has_feature(ptrauth_calls)
- func = (Terminator)__builtin_ptrauth_sign_unauthenticated((void*)func, ptrauth_key_asia, 0);
-#endif
// <rdar://problem/8543820&9228031> verify terminators are in image
- if ( ! this->containsAddress(stripPointer((void*)func)) ) {
+ if ( ! this->containsAddress((void*)func) ) {
dyld::throwf("termination function %p not in mapped image for %s\n", func, this->getPath());
}
if ( context.verboseInit )
@@ -2532,12 +2422,14 @@
}
// map in all segments
for(unsigned int i=0, e=segmentCount(); i < e; ++i) {
- vm_offset_t fileOffset = (vm_offset_t)(segFileOffset(i) + offsetInFat);
+ vm_offset_t fileOffset = segFileOffset(i) + offsetInFat;
vm_size_t size = segFileSize(i);
uintptr_t requestedLoadAddress = segPreferredLoadAddress(i) + slide;
int protection = 0;
if ( !segUnaccessible(i) ) {
- if ( segExecutable(i) )
+ // If has text-relocs, don't set x-bit initially.
+ // Instead set it later after text-relocs have been done.
+ if ( segExecutable(i) && !(segHasRebaseFixUps(i) && (slide != 0)) )
protection |= PROT_EXEC;
if ( segReadable(i) )
protection |= PROT_READ;
@@ -2636,13 +2528,12 @@
}
}
-#if TEXT_RELOC_SUPPORT
void ImageLoaderMachO::segMakeWritable(unsigned int segIndex, const ImageLoader::LinkContext& context)
{
vm_address_t addr = segActualLoadAddress(segIndex);
vm_size_t size = segSize(segIndex);
const bool setCurrentPermissions = false;
- vm_prot_t protection = VM_PROT_WRITE | VM_PROT_READ | VM_PROT_COPY;
+ vm_prot_t protection = VM_PROT_WRITE | VM_PROT_READ;
if ( segExecutable(segIndex) && !segHasRebaseFixUps(segIndex) )
protection |= VM_PROT_EXECUTE;
kern_return_t r = vm_protect(mach_task_self(), addr, size, setCurrentPermissions, protection);
@@ -2655,7 +2546,7 @@
(protection & PROT_READ) ? 'r' : '.', (protection & PROT_WRITE) ? 'w' : '.', (protection & PROT_EXEC) ? 'x' : '.' );
}
}
-#endif
+
const char* ImageLoaderMachO::findClosestSymbol(const mach_header* mh, const void* addr, const void** closestAddr)
{
@@ -2678,9 +2569,8 @@
unslidLinkEditBase = (uint8_t*)(seg->vmaddr - seg->fileoff);
linkEditBaseFound = true;
}
- else if ( strcmp(seg->segname, "__TEXT") == 0 ) {
+ else if ( (seg->fileoff == 0) && (seg->filesize != 0) )
slide = (uintptr_t)mh - seg->vmaddr;
- }
break;
case LC_SYMTAB:
symtab = (symtab_command*)cmd;
@@ -2845,12 +2735,3 @@
-uintptr_t ImageLoaderMachO::imageBaseAddress() const {
- //printf("imageBaseAddress: %s %d->%d\n", getPath(), 0, segmentCount());
- for (unsigned int i = 0, e = segmentCount(); i != e; ++i) {
- if ( (segFileOffset(i) == 0) && (segFileSize(i) != 0) )
- return segPreferredLoadAddress(i);
- }
- return 0;
-}
-