Loading...
--- dyld/dyld-640.2/src/dyldAPIs.cpp
+++ dyld/dyld-852.2/src/dyldAPIs.cpp
@@ -45,28 +45,24 @@
#include <sys/sysctl.h>
#include <mach/mach_traps.h> // for task_self_trap()
-
-#include "mach-o/dyld_images.h"
-#include "mach-o/dyld.h"
-#include "mach-o/dyld_priv.h"
+#include <mach-o/dyld_images.h>
+#include <mach-o/dyld.h>
+#include <mach-o/dyld_priv.h>
#include "ImageLoader.h"
#include "ImageLoaderMachO.h"
-#include "dyld.h"
+#include "dyld2.h"
#include "dyldLibSystemInterface.h"
#include "DyldSharedCache.h"
#include "MachOFile.h"
#undef _POSIX_C_SOURCE
-#include "dlfcn.h"
+#include <dlfcn.h>
#if __has_feature(ptrauth_calls)
#include <ptrauth.h>
#endif
-#ifndef CPU_SUBTYPE_ARM64_E
- #define CPU_SUBTYPE_ARM64_E 2
-#endif
// relocation_info.r_length field has value 3 for 64-bit executables and value 2 for 32-bit executables
#if __LP64__
@@ -113,10 +109,10 @@
// deprecated APIs are still availble on Mac OS X, but not on iPhone OS
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if TARGET_OS_OSX
+ #define DEPRECATED_APIS_SUPPORTED 1
+#else
#define DEPRECATED_APIS_SUPPORTED 0
-#else
- #define DEPRECATED_APIS_SUPPORTED 1
#endif
static bool sDynamicInterposing = false;
@@ -166,7 +162,7 @@
void* implementation;
};
-static struct dyld_func dyld_funcs[] = {
+static const struct dyld_func dyld_funcs[] = {
{"__dyld_register_func_for_add_image", (void*)_dyld_register_func_for_add_image },
{"__dyld_register_func_for_remove_image", (void*)_dyld_register_func_for_remove_image },
{"__dyld_dladdr", (void*)dladdr },
@@ -183,6 +179,7 @@
{"__dyld_get_image_vmaddr_slide", (void*)_dyld_get_image_vmaddr_slide },
{"__dyld_get_image_name", (void*)_dyld_get_image_name },
{"__dyld_get_image_slide", (void*)_dyld_get_image_slide },
+ {"__dyld_get_prog_image_header", (void*)_dyld_get_prog_image_header },
{"__dyld__NSGetExecutablePath", (void*)_NSGetExecutablePath },
// SPIs
@@ -201,6 +198,7 @@
{"__dyld_process_is_restricted", (void*)dyld::processIsRestricted },
{"__dyld_dynamic_interpose", (void*)dyld_dynamic_interpose },
{"__dyld_shared_cache_file_path", (void*)dyld::getStandardSharedCacheFilePath },
+ {"__dyld_has_inserted_or_interposing_libraries", (void*)dyld::hasInsertedOrInterposingLibraries },
{"__dyld_get_image_header_containing_address", (void*)dyld_image_header_containing_address },
{"__dyld_is_memory_immutable", (void*)_dyld_is_memory_immutable },
{"__dyld_objc_notify_register", (void*)_dyld_objc_notify_register },
@@ -208,9 +206,13 @@
{"__dyld_get_shared_cache_range", (void*)_dyld_get_shared_cache_range },
{"__dyld_images_for_addresses", (void*)_dyld_images_for_addresses },
{"__dyld_register_for_image_loads", (void*)_dyld_register_for_image_loads },
-
- // deprecated
+ {"__dyld_register_for_bulk_image_loads", (void*)_dyld_register_for_bulk_image_loads },
+ {"__dyld_register_driverkit_main", (void*)_dyld_register_driverkit_main },
+ {"__dyld_halt", (void*)dyld::halt },
+
#if DEPRECATED_APIS_SUPPORTED
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
{"__dyld_lookup_and_bind", (void*)client_dyld_lookup_and_bind },
{"__dyld_lookup_and_bind_with_hint", (void*)_dyld_lookup_and_bind_with_hint },
{"__dyld_lookup_and_bind_fully", (void*)_dyld_lookup_and_bind_fully },
@@ -252,6 +254,7 @@
#if OLD_LIBSYSTEM_SUPPORT
{"__dyld_link_module", (void*)_dyld_link_module },
#endif
+#pragma clang diagnostic pop
#endif //DEPRECATED_APIS_SUPPORTED
{NULL, 0}
@@ -388,6 +391,14 @@
return allImagesIndexedPath(image_index);
}
+const struct mach_header* _dyld_get_prog_image_header()
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s()\n", __func__);
+
+ return dyld::mainExecutable()->machHeader();
+}
+
static const void *stripPointer(const void *ptr) {
#if __has_feature(ptrauth_calls)
return __builtin_ptrauth_strip(ptr, ptrauth_key_asia);
@@ -416,7 +427,7 @@
return mh;
#endif
ImageLoader* image = dyld::findImageContainingAddress(address);
- if ( image != NULL )
+ if ( image != NULL )
return image->machHeader();
return NULL;
}
@@ -608,7 +619,6 @@
context.mustBeBundle = false;
context.mustBeDylib = true;
context.canBePIE = false;
- context.enforceIOSMac = false;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
@@ -774,6 +784,19 @@
ImageLoader* image = dyld::findImageContainingSymbol(symbol);
if ( image != NULL )
result = (void*)image->getExportedSymbolAddress(NSSymbolToSymbol(symbol), dyld::gLinkContext);
+
+#if __has_feature(ptrauth_calls)
+ // Sign the pointer if it points to a function
+ if ( result ) {
+ const ImageLoader* symbolImage = image;
+ if (!symbolImage->containsAddress(result)) {
+ symbolImage = dyld::findImageContainingAddress(result);
+ }
+ const macho_section *sect = symbolImage ? symbolImage->findSection(result) : NULL;
+ if ( sect && ((sect->flags & S_ATTR_PURE_INSTRUCTIONS) || (sect->flags & S_ATTR_SOME_INSTRUCTIONS)) )
+ result = __builtin_ptrauth_sign_unauthenticated(result, ptrauth_key_asia, 0);
+ }
+#endif
return result;
}
@@ -853,7 +876,6 @@
context.mustBeBundle = true;
context.mustBeDylib = false;
context.canBePIE = false;
- context.enforceIOSMac = false;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = NULL; // support not yet implemented
@@ -1371,7 +1393,7 @@
const bool leafName = (strchr(path, '/') == NULL);
const bool absolutePath = (path[0] == '/');
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if TARGET_OS_IPHONE
char canonicalPath[PATH_MAX];
// <rdar://problem/7017050> dlopen() not opening frameworks from shared cache with // or ./ in path
if ( !leafName ) {
@@ -1401,7 +1423,18 @@
// if requested path is to something in the dyld shared cache, always succeed
if ( dyld::inSharedCache(path) )
return true;
-
+
+#if TARGET_OS_OSX
+ // <rdar://problem/47464387> dlopen_preflight() on symlink to image in shared cache leaves it half loaded
+ if ( strncmp(path, "/System/Library/", 16) == 0 ) {
+ char canonicalPath[PATH_MAX];
+ if ( realpath(path, canonicalPath) ) {
+ if ( dyld::inSharedCache(canonicalPath) )
+ return true;
+ }
+ }
+#endif
+
bool result = false;
std::vector<const char*> rpathsFromCallerImage;
try {
@@ -1425,7 +1458,6 @@
context.mustBeBundle = false;
context.mustBeDylib = false;
context.canBePIE = true;
- context.enforceIOSMac = false;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
@@ -1507,7 +1539,7 @@
void* result = NULL;
const bool leafName = (strchr(path, '/') == NULL);
const bool absolutePath = (path[0] == '/');
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if TARGET_OS_IPHONE
char canonicalPath[PATH_MAX];
// <rdar://problem/7017050> dlopen() not opening frameworks from shared cache with // or ./ in path
if ( !leafName ) {
@@ -1560,7 +1592,6 @@
context.mustBeBundle = false;
context.mustBeDylib = false;
context.canBePIE = true;
- context.enforceIOSMac = false;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
@@ -1821,7 +1852,7 @@
// Sign the pointer if it points to a function
// Note we only do this if the main executable is arm64e as otherwise we
// may end up calling containsAddress on the accelerator tables.
- if ( result && (dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype == CPU_SUBTYPE_ARM64_E) ) {
+ if ( result && ((dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype & ~CPU_SUBTYPE_MASK) == CPU_SUBTYPE_ARM64E) ) {
const ImageLoader* symbolImage = image;
if (!symbolImage->containsAddress(result)) {
symbolImage = dyld::findImageContainingAddress(result);
@@ -1855,7 +1886,7 @@
// Sign the pointer if it points to a function
// Note we only do this if the main executable is arm64e as otherwise we
// may end up calling containsAddress on the accelerator tables.
- if ( result && (dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype == CPU_SUBTYPE_ARM64_E) ) {
+ if ( result && ((dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype & ~CPU_SUBTYPE_MASK) == CPU_SUBTYPE_ARM64E) ) {
const ImageLoader* symbolImage = image;
if (!symbolImage->containsAddress(result)) {
symbolImage = dyld::findImageContainingAddress(result);
@@ -1901,7 +1932,7 @@
// Sign the pointer if it points to a function
// Note we only do this if the main executable is arm64e as otherwise we
// may end up calling containsAddress on the accelerator tables.
- if ( result && (dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype == CPU_SUBTYPE_ARM64_E) ) {
+ if ( result && ((dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype & ~CPU_SUBTYPE_MASK) == CPU_SUBTYPE_ARM64E) ) {
const ImageLoader* symbolImage = image;
if (!symbolImage->containsAddress(result)) {
symbolImage = dyld::findImageContainingAddress(result);
@@ -1946,7 +1977,7 @@
// Sign the pointer if it points to a function
// Note we only do this if the main executable is arm64e as otherwise we
// may end up calling containsAddress on the accelerator tables.
- if ( result && (dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype == CPU_SUBTYPE_ARM64_E) ) {
+ if ( result && ((dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype & ~CPU_SUBTYPE_MASK) == CPU_SUBTYPE_ARM64E) ) {
const ImageLoader* symbolImage = image;
if (!symbolImage->containsAddress(result)) {
symbolImage = dyld::findImageContainingAddress(result);
@@ -1997,7 +2028,7 @@
// Sign the pointer if it points to a function
// Note we only do this if the main executable is arm64e as otherwise we
// may end up calling containsAddress on the accelerator tables.
- if ( result && (dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype == CPU_SUBTYPE_ARM64_E) ) {
+ if ( result && ((dyld::gLinkContext.mainExecutable->machHeader()->cpusubtype & ~CPU_SUBTYPE_MASK) == CPU_SUBTYPE_ARM64E) ) {
const ImageLoader* symbolImage = image;
if (!symbolImage->containsAddress(result)) {
symbolImage = dyld::findImageContainingAddress(result);
@@ -2090,8 +2121,9 @@
#endif
ImageLoader* image = dyld::findImageContainingAddress(address);
- if ( image != NULL )
+ if ( image != NULL ) {
return image->getRealPath();
+ }
return NULL;
}
@@ -2114,6 +2146,9 @@
ImageLoader* image = dyld::findImageByMachHeader(mh);
if ( image == NULL )
return;
+
+ // make the cache writable for this block
+ DyldSharedCache::DataConstScopedWriter patcher(dyld::gLinkContext.dyldCache, mach_task_self(), (dyld::gLinkContext.verboseMapping ? &dyld::log : nullptr));
// make pass at bound references in this image and update them
dyld::gLinkContext.dynamicInterposeArray = array;
@@ -2184,7 +2219,8 @@
const DyldSharedCache* cache = (DyldSharedCache*)dyld::imMemorySharedCacheHeader();
if ( cache != nullptr ) {
const dyld_cache_mapping_info* const mappings = (dyld_cache_mapping_info*)((char*)cache + cache->header.mappingOffset);
- *length = (size_t)((mappings[2].address + mappings[2].size) - mappings[0].address);
+ const dyld_cache_mapping_info* lastMapping = &mappings[cache->header.mappingCount - 1];
+ *length = (size_t)((lastMapping->address + lastMapping->size) - cache->unslidLoadAddress());
return cache;
}
return nullptr;
@@ -2203,7 +2239,7 @@
infos[i].image = mh;
infos[i].offsetInImage = (uintptr_t)addr - (uintptr_t)mh;
((dyld3::MachOFile*)mh)->getUuid(infos[i].uuid);
- break;
+ continue;
}
#endif
ImageLoader* image = dyld::findImageContainingAddress(addr);
@@ -2222,6 +2258,16 @@
dyld::registerLoadCallback(func);
}
-
-
-
+void _dyld_register_for_bulk_image_loads(void (*func)(unsigned imageCount, const struct mach_header* mhs[], const char* paths[]))
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s(%p)\n", __func__, (void *)func);
+ dyld::registerBulkLoadCallback(func);
+}
+
+void _dyld_register_driverkit_main(void (*mainFunc)())
+{
+ dyld::setMainEntry(mainFunc);
+}
+
+