Loading...
--- dyld/dyld-1340/libdyld/dyld_process_info.cpp
+++ dyld/dyld-1245.1/libdyld/dyld_process_info.cpp
@@ -46,10 +46,6 @@
#include "Tracing.h"
#include "DyldProcessConfig.h"
#include "StringUtils.h"
-#include "DyldLegacyInterfaceGlue.h"
-#include "SafeVMPrimitives.h"
-
-extern "C" const dyld_all_image_infos* getProcessDyldInfo();
#define BLEND_KERN_RETURN_LOCATION(kr, loc) (kr) = ((kr & 0x00ffffff) | loc<<24);
@@ -70,17 +66,29 @@
std::pair<mach_vm_address_t, kern_return_t>
RemoteBuffer::map(task_t task, mach_vm_address_t remote_address, vm_size_t size) {
+ static kern_return_t (*mvrn)(vm_map_t, mach_vm_address_t*, mach_vm_size_t, mach_vm_offset_t, int, vm_map_read_t, mach_vm_address_t,
+ boolean_t, vm_prot_t*, vm_prot_t*, vm_inherit_t) = nullptr;
vm_prot_t cur_protection = VM_PROT_NONE;
vm_prot_t max_protection = VM_PROT_READ;
if (size == 0) {
return std::make_pair(MACH_VM_MIN_ADDRESS, KERN_INVALID_ARGUMENT);
}
mach_vm_address_t localAddress = 0;
-#if __arm64e__
- // Mask out TBI bits
- remote_address &= 0x00ff'ffff'ffff'ffffUL;
+#if TARGET_OS_SIMULATOR
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ mvrn = (kern_return_t (*)(vm_map_t, mach_vm_address_t*, mach_vm_size_t, mach_vm_offset_t, int, vm_map_read_t, mach_vm_address_t,
+ boolean_t, vm_prot_t*, vm_prot_t*, vm_inherit_t))dlsym(RTLD_DEFAULT, "mach_vm_remap_new");
+ if (mvrn == nullptr) {
+ // We are running on a system that does not support task_read ports, use the old call
+ mvrn = (kern_return_t (*)(vm_map_t, mach_vm_address_t*, mach_vm_size_t, mach_vm_offset_t, int, vm_map_read_t, mach_vm_address_t,
+ boolean_t, vm_prot_t*, vm_prot_t*, vm_inherit_t))dlsym(RTLD_DEFAULT, "mach_vm_remap");
+ }
+ });
+#else
+ mvrn = &mach_vm_remap_new;
#endif
- auto kr = mach_vm_remap_new(mach_task_self(),
+ auto kr = mvrn(mach_task_self(),
&localAddress,
size,
0, // mask
@@ -93,7 +101,6 @@
VM_INHERIT_NONE);
// The call is not succesfull return
if (kr != KERN_SUCCESS) {
- BLEND_KERN_RETURN_LOCATION(kr, 0xfd)
return std::make_pair(MACH_VM_MIN_ADDRESS, kr);
}
// If it is not a shared buffer then copy it into a local buffer so our results are coherent in the event
@@ -107,9 +114,7 @@
(void)vm_deallocate(mach_task_self(), (vm_address_t)localAddress, size);
return std::make_pair(MACH_VM_MIN_ADDRESS, KERN_NO_SPACE);
}
- remote_memory_audit_start();
memcpy(buffer, (void *)localAddress, size);
- remote_memory_audit_end();
((char*)buffer)[size] = 0; // Add a null terminator so strlcpy does not read base the end of the buffer.
(void)vm_deallocate(mach_task_self(), (vm_address_t)localAddress, size);
return std::make_pair((vm_address_t)buffer, KERN_SUCCESS);
@@ -369,9 +374,8 @@
withRemoteBuffer(task, infoArray, imageArraySize, false, kr, ^(void *buffer, size_t size) {
// figure out how many path strings will need to be copied and their size
T2* imageArray = (T2 *)buffer;
- const dyld_all_image_infos* myInfo = getProcessDyldInfo(); // FIXME: should not need dyld_all_image_info
+ const dyld_all_image_infos* myInfo = (const dyld_all_image_infos*)dyld4::gDyld.allImageInfos; // FIXME: should not need dyld_all_image_info
const bool sameCacheAsThisProcess = true
- && (myInfo != nullptr)
&& (allImageInfo.sharedCacheBaseAddress != 0)
&& (myInfo->sharedCacheBaseAddress != 0)
&& !allImageInfo.processDetachedFromSharedRegion
@@ -411,6 +415,10 @@
+ sizeof(dyld_aot_image_info_64)*(aotImageCount) // add the size necessary for aot info to this buffer
+ sizeof(SegmentInfo)*imageCountWithDyld*10
+ countOfPathsNeedingCopying*PATH_MAX;
+
+ // Add 32KB of padding just in case there's some kind of overflow/corruption in building the buffer
+ allocationSize += 0x8000;
+
void* storage = malloc(allocationSize);
if (storage == nullptr) {
*kr = KERN_NO_SPACE;
@@ -541,6 +549,7 @@
char mainExecutablePathBuffer[PATH_MAX+1];
__block char * dyldPath = &dyldPathBuffer[0];
__block char * mainExecutablePath = &mainExecutablePathBuffer[0];
+ __block dyld3::Platform platformID = dyld3::Platform::unknown;
mach_vm_size_t size;
dyldPathBuffer[0] = '\0';
mainExecutablePathBuffer[0] = '\0';
@@ -611,7 +620,7 @@
BLEND_KERN_RETURN_LOCATION(*kr, 0xfa)
return nullptr;
}
- auto obj = dyld_process_info_ptr(new (storage) dyld_process_info_base(PLATFORM_UNKNOWN, imageCount, aotImageCount, allocationSize), deleter);
+ auto obj = dyld_process_info_ptr(new (storage) dyld_process_info_base((dyld_platform_t)platformID, imageCount, aotImageCount, allocationSize), deleter);
(void)obj->reserveSpace(sizeof(dyld_process_info_base)+sizeof(dyld_process_cache_info)+sizeof(dyld_process_aot_cache_info)+sizeof(dyld_process_state_info));
// fill in base info
dyld_process_cache_info* cacheInfo = obj->cacheInfo();
@@ -697,6 +706,8 @@
uint64_t imageAddress, uint64_t imagePath, const char* imagePathLocal,
uint32_t imageIndex)
{
+ kern_return_t kr = KERN_SUCCESS;
+
const DyldSharedCache* dyldCacheHeader = (DyldSharedCache*)sharedCacheStart;
bool readOnly = false;
_curImage->loadAddress = imageAddress;
@@ -706,7 +717,6 @@
} else if ( sameCacheAsThisProcess && dyldCacheHeader != nullptr && dyldCacheHeader->inCache((void*)imagePath, 1, readOnly) && readOnly ) {
_curImage->path = (const char*)imagePath;
} else if (imagePath) {
- kern_return_t kr = KERN_SUCCESS;
_curImage->path = copyPath(task, &kr, imagePath);
if ( kr != KERN_SUCCESS ) {
return kr;
@@ -720,7 +730,7 @@
if ( sameCacheAsThisProcess && dyldCacheHeader != nullptr && dyldCacheHeader->inCache((void*)imageAddress, 32*1024, readOnly) ) {
addInfoFromLoadCommands((mach_header*)imageAddress, imageAddress, 32*1024);
} else {
- auto kr = addInfoFromRemoteLoadCommands(task, imageAddress);
+ kr = addInfoFromRemoteLoadCommands(task, imageAddress);
if (kr != KERN_SUCCESS) {
// The image is not here, return early
return kr;
@@ -728,7 +738,7 @@
}
_curImage->segmentsCount = _curSegmentIndex - _curImage->segmentStartIndex;
_curImage++;
- return KERN_SUCCESS;
+ return kr;
}
kern_return_t dyld_process_info_base::addAotImage(dyld_aot_image_info_64 aotImageInfo) {
@@ -796,7 +806,7 @@
_curImage->segmentsCount = _curSegmentIndex - _curImage->segmentStartIndex;
_curImage++;
- return KERN_SUCCESS;
+ return kr;
}
@@ -864,18 +874,7 @@
void dyld_process_info_base::forEachImage(void (^callback)(uint64_t machHeaderAddress, const uuid_t uuid, const char* path)) const
{
for (const ImageInfo* p = _firstImage; p < _curImage; ++p) {
- // Set a temporary to hold a log message. We will always switch back to the original value before the scope ends, so it can live on the stack
- char asiBuffer[1024];
- const char* oldLogMessage = CRGetCrashLogMessage();
- if (p->loadAddress == 0 || p->path == nullptr) {
- // Set an ASI for debugging. Unfortunately we don't have much state here, so let's grab what we have that is meaingful which will hopefully
- // let us figure out why this is sometimes set incorrectly.
- snprintf(&asiBuffer[0], 1024, "Bad dyld_proces_info image info for\n\tplatform: %u\n\taddress = 0x%llx\n\tpath = %s\n",
- _platform, p->loadAddress, p->path ? p->path : "(null)");
- CRSetCrashLogMessage(asiBuffer);
- }
callback(p->loadAddress, p->uuid, p->path);
- CRSetCrashLogMessage(oldLogMessage);
}
}
@@ -914,9 +913,6 @@
dyld_process_info _dyld_process_info_create(task_t task, uint64_t timestamp, kern_return_t* kr)
{
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_create(task, timestamp, kr);
- }
__block dyld_process_info result = nullptr;
kern_return_t krSink = KERN_SUCCESS;
if (kr == nullptr) {
@@ -958,6 +954,7 @@
});
if (*kr == KERN_SUCCESS) { break; }
// possible that dyld moved, causing imageinfo reads to fail, so get TASK_DYLD_INFO again
+
task_dyld_info_data_t task_dyld_info2;
mach_msg_type_number_t count2 = TASK_DYLD_INFO_COUNT;
if ( task_info(task, TASK_DYLD_INFO, (task_info_t)&task_dyld_info2, &count2) == KERN_SUCCESS ) {
@@ -969,74 +966,47 @@
void _dyld_process_info_get_state(dyld_process_info info, dyld_process_state_info* stateInfo)
{
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_get_state(info, stateInfo);
- }
*stateInfo = *info->stateInfo();
}
void _dyld_process_info_get_cache(dyld_process_info info, dyld_process_cache_info* cacheInfo)
{
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_get_cache(info, cacheInfo);
- }
*cacheInfo = *info->cacheInfo();
}
void _dyld_process_info_get_aot_cache(dyld_process_info info, dyld_process_aot_cache_info* aotCacheInfo)
{
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_get_aot_cache(info, aotCacheInfo);
- }
*aotCacheInfo = *info->aotCacheInfo();
}
void _dyld_process_info_retain(dyld_process_info object)
{
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_retain(object);
- }
const_cast<dyld_process_info_base*>(object)->retain();
}
dyld_platform_t _dyld_process_info_get_platform(dyld_process_info object) {
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_get_platform(object);
- }
return const_cast<dyld_process_info_base*>(object)->platform();
}
void _dyld_process_info_release(dyld_process_info object)
{
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_release(object);
- }
const_cast<dyld_process_info_base*>(object)->release();
}
void _dyld_process_info_for_each_image(dyld_process_info info, void (^callback)(uint64_t machHeaderAddress, const uuid_t uuid, const char* path))
{
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_for_each_image(info, callback);
- }
info->forEachImage(callback);
}
#if TARGET_OS_OSX
void _dyld_process_info_for_each_aot_image(dyld_process_info info, bool (^callback)(uint64_t x86Address, uint64_t aotAddress, uint64_t aotSize, uint8_t* aotImageKey, size_t aotImageKeySize))
{
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_for_each_aot_image(info, callback);
- }
info->forEachAotImage(callback);
}
#endif
void _dyld_process_info_for_each_segment(dyld_process_info info, uint64_t machHeaderAddress, void (^callback)(uint64_t segmentAddress, uint64_t segmentSize, const char* segmentName))
{
- if ( const IntrospectionVtable* vtable = dyldFrameworkIntrospectionVtable() ) {
- return vtable->_dyld_process_info_for_each_segment(info, machHeaderAddress, callback);
- }
info->forEachSegment(machHeaderAddress, callback);
}