Loading...
dyld3/SharedCacheRuntime.cpp dyld-625.13 dyld-519.2.2
--- dyld/dyld-625.13/dyld3/SharedCacheRuntime.cpp
+++ dyld/dyld-519.2.2/dyld3/SharedCacheRuntime.cpp
@@ -45,6 +45,8 @@
 
 #include "dyld_cache_format.h"
 #include "SharedCacheRuntime.h"
+#include "LaunchCache.h"
+#include "LaunchCacheFormat.h"
 #include "Loading.h"
 
 #define ENABLE_DYLIBS_TO_OVERRIDE_CACHE_SIZE 1024
@@ -100,18 +102,13 @@
     #define ARCH_NAME            "arm64e"
     #define ARCH_CACHE_MAGIC     "dyld_v1  arm64e"
 #elif __arm64__
-    #if __LP64__
-        #define ARCH_NAME            "arm64"
-        #define ARCH_CACHE_MAGIC     "dyld_v1   arm64"
-    #else
-        #define ARCH_NAME            "arm64_32"
-        #define ARCH_CACHE_MAGIC     "dyld_v1arm64_32"
-    #endif
-#endif
-
-
-
-static void rebaseChainV2(uint8_t* pageContent, uint16_t startOffset, uintptr_t slideAmount, const dyld_cache_slide_info2* slideInfo)
+    #define ARCH_NAME            "arm64"
+    #define ARCH_CACHE_MAGIC     "dyld_v1   arm64"
+#endif
+
+
+
+static void rebaseChain(uint8_t* pageContent, uint16_t startOffset, uintptr_t slideAmount, const dyld_cache_slide_info2* slideInfo)
 {
     const uintptr_t   deltaMask    = (uintptr_t)(slideInfo->delta_mask);
     const uintptr_t   valueMask    = ~deltaMask;
@@ -135,38 +132,6 @@
     }
 }
 
-#if !__LP64__
-static void rebaseChainV4(uint8_t* pageContent, uint16_t startOffset, uintptr_t slideAmount, const dyld_cache_slide_info4* slideInfo)
-{
-    const uintptr_t   deltaMask    = (uintptr_t)(slideInfo->delta_mask);
-    const uintptr_t   valueMask    = ~deltaMask;
-    const uintptr_t   valueAdd     = (uintptr_t)(slideInfo->value_add);
-    const unsigned    deltaShift   = __builtin_ctzll(deltaMask) - 2;
-
-    uint32_t pageOffset = startOffset;
-    uint32_t delta = 1;
-    while ( delta != 0 ) {
-        uint8_t* loc = pageContent + pageOffset;
-        uintptr_t rawValue = *((uintptr_t*)loc);
-        delta = (uint32_t)((rawValue & deltaMask) >> deltaShift);
-        uintptr_t value = (rawValue & valueMask);
-        if ( (value & 0xFFFF8000) == 0 ) {
-           // small positive non-pointer, use as-is
-        }
-        else if ( (value & 0x3FFF8000) == 0x3FFF8000 ) {
-           // small negative non-pointer
-           value |= 0xC0000000;
-        }
-        else {
-            value += valueAdd;
-            value += slideAmount;
-        }
-        *((uintptr_t*)loc) = value;
-        //dyld::log("         pageOffset=0x%03X, loc=%p, org value=0x%08llX, new value=0x%08llX, delta=0x%X\n", pageOffset, loc, (uint64_t)rawValue, (uint64_t)value, delta);
-        pageOffset += delta;
-    }
-}
-#endif
 
 static void getCachePath(const SharedCacheOptions& options, size_t pathBufferSize, char pathBuffer[])
 {
@@ -203,11 +168,10 @@
     struct stat enableStatBuf;
     struct stat devCacheStatBuf;
     struct stat optCacheStatBuf;
-    bool developmentDevice = dyld3::internalInstall();
     bool enableFileExists = (dyld::my_stat(IPHONE_DYLD_SHARED_CACHE_DIR "enable-dylibs-to-override-cache", &enableStatBuf) == 0);
     bool devCacheExists = (dyld::my_stat(IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME ARCH_NAME DYLD_SHARED_CACHE_DEVELOPMENT_EXT, &devCacheStatBuf) == 0);
     bool optCacheExists = (dyld::my_stat(IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME ARCH_NAME, &optCacheStatBuf) == 0);
-    if ( developmentDevice && ((enableFileExists && (enableStatBuf.st_size < ENABLE_DYLIBS_TO_OVERRIDE_CACHE_SIZE) && devCacheExists) || !optCacheExists) )
+    if ( (enableFileExists && (enableStatBuf.st_size < ENABLE_DYLIBS_TO_OVERRIDE_CACHE_SIZE) && devCacheExists) || !optCacheExists )
         strlcat(pathBuffer, DYLD_SHARED_CACHE_DEVELOPMENT_EXT, pathBufferSize);
 #endif
 
@@ -241,7 +205,7 @@
     if ( cache->header.mappingOffset < 0xE0 )
         return true;
 
-    if ( cache->header.platform != (uint32_t)MachOFile::currentPlatform() )
+    if ( cache->header.platform != (uint32_t)MachOParser::currentPlatform() )
         return false;
 
 #if TARGET_IPHONE_SIMULATOR
@@ -276,7 +240,6 @@
         results->errorMessage = "shared cache file cannot be opened";
         return false;
     }
-
     struct stat cacheStatBuf;
     if ( dyld::my_stat(results->path, &cacheStatBuf) != 0 ) {
         results->errorMessage = "shared cache file cannot be stat()ed";
@@ -303,13 +266,10 @@
         ::close(fd);
         return false;
     }
-    if ( (cache->header.mappingCount != 3) || (cache->header.mappingOffset > 0x138) ) {
-        results->errorMessage = "shared cache file mappings are invalid";
-        ::close(fd);
-        return false;
-    }
     const dyld_cache_mapping_info* const fileMappings = (dyld_cache_mapping_info*)&firstPage[cache->header.mappingOffset];
-    if (  (fileMappings[0].fileOffset != 0)
+    if ( (cache->header.mappingCount != 3)
+      || (cache->header.mappingOffset > 0x120)
+      || (fileMappings[0].fileOffset != 0)
       || ((fileMappings[0].address + fileMappings[0].size) > fileMappings[1].address)
       || ((fileMappings[1].address + fileMappings[1].size) > fileMappings[2].address)
       || ((fileMappings[0].fileOffset + fileMappings[0].size) != fileMappings[1].fileOffset)
@@ -364,7 +324,7 @@
         return false;
     }
     if ( memcmp(mappedData, firstPage, sizeof(firstPage)) != 0 ) {
-        results->errorMessage = "first page of mmap()ed shared cache not valid";
+        results->errorMessage = "first page of shared cache not mmap()able";
         ::close(fd);
         return false;
     }
@@ -400,120 +360,7 @@
     return true;
 }
 
-
 #if !TARGET_IPHONE_SIMULATOR
-
-// update all __DATA pages with slide info
-static bool rebaseDataPages(bool isVerbose, CacheInfo& info, SharedCacheLoadInfo* results)
-{
-    uint64_t dataPagesStart = info.mappings[1].sfm_address;
-    const dyld_cache_slide_info* slideInfo = nullptr;
-    if ( info.slideInfoSize != 0 ) {
-        slideInfo = (dyld_cache_slide_info*)(info.slideInfoAddressUnslid + results->slide);
-    }
-    const dyld_cache_slide_info* slideInfoHeader = (dyld_cache_slide_info*)slideInfo;
-    if ( slideInfoHeader != nullptr ) {
-        if ( slideInfoHeader->version == 2 ) {
-            const dyld_cache_slide_info2* slideHeader = (dyld_cache_slide_info2*)slideInfo;
-            const uint32_t  page_size = slideHeader->page_size;
-            const uint16_t* page_starts = (uint16_t*)((long)(slideInfo) + slideHeader->page_starts_offset);
-            const uint16_t* page_extras = (uint16_t*)((long)(slideInfo) + slideHeader->page_extras_offset);
-            for (int i=0; i < slideHeader->page_starts_count; ++i) {
-                uint8_t* page = (uint8_t*)(long)(dataPagesStart + (page_size*i));
-                uint16_t pageEntry = page_starts[i];
-                //dyld::log("page[%d]: page_starts[i]=0x%04X\n", i, pageEntry);
-                if ( pageEntry == DYLD_CACHE_SLIDE_PAGE_ATTR_NO_REBASE )
-                    continue;
-                if ( pageEntry & DYLD_CACHE_SLIDE_PAGE_ATTR_EXTRA ) {
-                    uint16_t chainIndex = (pageEntry & 0x3FFF);
-                    bool done = false;
-                    while ( !done ) {
-                        uint16_t pInfo = page_extras[chainIndex];
-                        uint16_t pageStartOffset = (pInfo & 0x3FFF)*4;
-                        //dyld::log("     chain[%d] pageOffset=0x%03X\n", chainIndex, pageStartOffset);
-                        rebaseChainV2(page, pageStartOffset, results->slide, slideHeader);
-                        done = (pInfo & DYLD_CACHE_SLIDE_PAGE_ATTR_END);
-                        ++chainIndex;
-                    }
-                }
-                else {
-                    uint32_t pageOffset = pageEntry * 4;
-                    //dyld::log("     start pageOffset=0x%03X\n", pageOffset);
-                    rebaseChainV2(page, pageOffset, results->slide, slideHeader);
-                }
-            }
-        }
-#if __LP64__
-        else if ( slideInfoHeader->version == 3 ) {
-             const dyld_cache_slide_info3* slideHeader = (dyld_cache_slide_info3*)slideInfo;
-             const uint32_t                pageSize    = slideHeader->page_size;
-             for (int i=0; i < slideHeader->page_starts_count; ++i) {
-                 uint8_t* page = (uint8_t*)(dataPagesStart + (pageSize*i));
-                 uint64_t delta = slideHeader->page_starts[i];
-                 if ( delta == DYLD_CACHE_SLIDE_V3_PAGE_ATTR_NO_REBASE )
-                     continue;
-                 delta = delta/sizeof(uint64_t); // initial offset is byte based
-                 dyld_cache_slide_pointer3* loc = (dyld_cache_slide_pointer3*)page;
-                 do {
-                     loc += delta;
-                     delta = loc->plain.offsetToNextPointer;
-                     if ( loc->auth.authenticated ) {
-#if __has_feature(ptrauth_calls)
-                        uint64_t target = info.sharedRegionStart + loc->auth.offsetFromSharedCacheBase + results->slide;
-                        MachOLoaded::ChainedFixupPointerOnDisk ptr;
-                        ptr.raw = *((uint64_t*)loc);
-                        loc->raw = ptr.signPointer(loc, target);
-#else
-                        results->errorMessage = "invalid pointer kind in cache file";
-                        return false;
-#endif
-                     }
-                     else {
-                         loc->raw = MachOLoaded::ChainedFixupPointerOnDisk::signExtend51(loc->plain.pointerValue) + results->slide;
-                     }
-                } while (delta != 0);
-            }
-        }
-#else
-        else if ( slideInfoHeader->version == 4 ) {
-            const dyld_cache_slide_info4* slideHeader = (dyld_cache_slide_info4*)slideInfo;
-            const uint32_t  page_size = slideHeader->page_size;
-            const uint16_t* page_starts = (uint16_t*)((long)(slideInfo) + slideHeader->page_starts_offset);
-            const uint16_t* page_extras = (uint16_t*)((long)(slideInfo) + slideHeader->page_extras_offset);
-            for (int i=0; i < slideHeader->page_starts_count; ++i) {
-                uint8_t* page = (uint8_t*)(long)(dataPagesStart + (page_size*i));
-                uint16_t pageEntry = page_starts[i];
-                //dyld::log("page[%d]: page_starts[i]=0x%04X\n", i, pageEntry);
-                if ( pageEntry == DYLD_CACHE_SLIDE4_PAGE_NO_REBASE )
-                    continue;
-                if ( pageEntry & DYLD_CACHE_SLIDE4_PAGE_USE_EXTRA ) {
-                    uint16_t chainIndex = (pageEntry & DYLD_CACHE_SLIDE4_PAGE_INDEX);
-                    bool done = false;
-                    while ( !done ) {
-                        uint16_t pInfo = page_extras[chainIndex];
-                        uint16_t pageStartOffset = (pInfo & DYLD_CACHE_SLIDE4_PAGE_INDEX)*4;
-                        //dyld::log("     chain[%d] pageOffset=0x%03X\n", chainIndex, pageStartOffset);
-                        rebaseChainV4(page, pageStartOffset, results->slide, slideHeader);
-                        done = (pInfo & DYLD_CACHE_SLIDE4_PAGE_EXTRA_END);
-                        ++chainIndex;
-                    }
-                }
-                else {
-                    uint32_t pageOffset = pageEntry * 4;
-                    //dyld::log("     start pageOffset=0x%03X\n", pageOffset);
-                    rebaseChainV4(page, pageOffset, results->slide, slideHeader);
-                }
-            }
-        }
-#endif // LP64
-        else {
-            results->errorMessage = "invalid slide info in cache file";
-            return false;
-        }
-    }
-    return true;
-}
-
 static bool reuseExistingCache(const SharedCacheOptions& options, SharedCacheLoadInfo* results)
 {
     uint64_t cacheBaseAddress;
@@ -527,6 +374,10 @@
             const dyld_cache_mapping_info* const fileMappings = (dyld_cache_mapping_info*)(cacheBaseAddress + existingCache->header.mappingOffset);
             results->loadAddress = existingCache;
             results->slide = (long)(cacheBaseAddress - fileMappings[0].address);
+            if ( (existingCache->header.mappingOffset > 0xD0) && (existingCache->header.dylibsImageGroupAddr != 0) )
+                results->cachedDylibsGroup = (const launch_cache::binary_format::ImageGroup*)(existingCache->header.dylibsImageGroupAddr + results->slide);
+            else
+                results->cachedDylibsGroup = nullptr;
             // we don't know the path this cache was previously loaded from, assume default
             getCachePath(options, sizeof(results->path), results->path);
             if ( options.verbose ) {
@@ -559,7 +410,7 @@
 #endif
 
     // <rdar://problem/32031197> respect -disable_aslr boot-arg
-    if ( dyld3::bootArgsContains("-disable_aslr") )
+    if ( dyld3::loader::bootArgsContains("-disable_aslr") )
         slide = 0;
 
     // update mappings
@@ -581,6 +432,10 @@
         results->slide = pickCacheASLR(info);
         slideInfo = (dyld_cache_slide_info2*)(info.slideInfoAddressUnslid + results->slide);
     }
+    if ( info.cachedDylibsGroupUnslid != 0 )
+        results->cachedDylibsGroup = (const launch_cache::binary_format::ImageGroup*)(info.cachedDylibsGroupUnslid + results->slide);
+    else
+        results->cachedDylibsGroup = nullptr;
 
     int result = __shared_region_map_and_slide_np(info.fd, 3, info.mappings, results->slide, slideInfo, info.slideInfoSize);
     ::close(info.fd);
@@ -592,8 +447,7 @@
         if ( reuseExistingCache(options, results) )
             return true;
         // if cache does not exist, then really is an error
-        if ( results->errorMessage == nullptr )
-            results->errorMessage = "syscall to map cache into shared region failed";
+        results->errorMessage = "syscall to map cache into shared region failed";
         return false;
     }
 
@@ -603,7 +457,7 @@
     }
     return true;
 }
-#endif // TARGET_IPHONE_SIMULATOR
+#endif
 
 static bool mapCachePrivate(const SharedCacheOptions& options, SharedCacheLoadInfo* results)
 {
@@ -614,12 +468,18 @@
 
     // compute ALSR slide
     results->slide = 0;
+    const dyld_cache_slide_info2* slideInfo = nullptr;
 #if !TARGET_IPHONE_SIMULATOR // simulator caches do not support sliding
     if ( info.slideInfoSize != 0 ) {
         results->slide = pickCacheASLR(info);
+        slideInfo = (dyld_cache_slide_info2*)(info.slideInfoAddressUnslid + results->slide);
     }
 #endif
     results->loadAddress = (const DyldSharedCache*)(info.mappings[0].sfm_address);
+     if ( info.cachedDylibsGroupUnslid != 0 )
+        results->cachedDylibsGroup = (const launch_cache::binary_format::ImageGroup*)(info.cachedDylibsGroupUnslid + results->slide);
+    else
+        results->cachedDylibsGroup = nullptr;
 
     // remove the shared region sub-map
     vm_deallocate(mach_task_self(), (vm_address_t)info.sharedRegionStart, (vm_size_t)info.sharedRegionSize);
@@ -643,22 +503,55 @@
             vm_deallocate(mach_task_self(), (vm_address_t)info.sharedRegionStart, (vm_size_t)info.sharedRegionSize);
             // return failure
             results->loadAddress        = nullptr;
+            results->cachedDylibsGroup  = nullptr;
             results->errorMessage       = "could not mmap() part of dyld cache";
             return false;
         }
     }
 
-#if TARGET_IPHONE_SIMULATOR // simulator caches do not support sliding
-    return true;
-#else
-    bool success = rebaseDataPages(options.verbose, info, results);
+    // update all __DATA pages with slide info
+    const dyld_cache_slide_info* slideInfoHeader = (dyld_cache_slide_info*)slideInfo;
+    if ( slideInfoHeader != nullptr ) {
+        if ( slideInfoHeader->version != 2 ) {
+            results->errorMessage = "invalide slide info in cache file";
+            return false;
+        }
+        const dyld_cache_slide_info2* slideHeader = (dyld_cache_slide_info2*)slideInfo;
+        const uint32_t  page_size = slideHeader->page_size;
+        const uint16_t* page_starts = (uint16_t*)((long)(slideInfo) + slideHeader->page_starts_offset);
+        const uint16_t* page_extras = (uint16_t*)((long)(slideInfo) + slideHeader->page_extras_offset);
+        const uintptr_t dataPagesStart = (uintptr_t)info.mappings[1].sfm_address;
+        for (int i=0; i < slideHeader->page_starts_count; ++i) {
+            uint8_t* page = (uint8_t*)(long)(dataPagesStart + (page_size*i));
+            uint16_t pageEntry = page_starts[i];
+            //dyld::log("page[%d]: page_starts[i]=0x%04X\n", i, pageEntry);
+            if ( pageEntry == DYLD_CACHE_SLIDE_PAGE_ATTR_NO_REBASE )
+                continue;
+            if ( pageEntry & DYLD_CACHE_SLIDE_PAGE_ATTR_EXTRA ) {
+                uint16_t chainIndex = (pageEntry & 0x3FFF);
+                bool done = false;
+                while ( !done ) {
+                    uint16_t pInfo = page_extras[chainIndex];
+                    uint16_t pageStartOffset = (pInfo & 0x3FFF)*4;
+                    //dyld::log("     chain[%d] pageOffset=0x%03X\n", chainIndex, pageStartOffset);
+                    rebaseChain(page, pageStartOffset, results->slide, slideInfo);
+                    done = (pInfo & DYLD_CACHE_SLIDE_PAGE_ATTR_END);
+                    ++chainIndex;
+                }
+            }
+            else {
+                uint32_t pageOffset = pageEntry * 4;
+                //dyld::log("     start pageOffset=0x%03X\n", pageOffset);
+                rebaseChain(page, pageOffset, results->slide, slideInfo);
+            }
+        }
+    }
 
     if ( options.verbose ) {
         dyld::log("mapped dyld cache file private to process (%s):\n", results->path);
         verboseSharedCacheMappings(info.mappings);
     }
-    return success;
-#endif
+    return true;
 }
 
 
@@ -667,6 +560,7 @@
 {
     results->loadAddress        = 0;
     results->slide              = 0;
+    results->cachedDylibsGroup  = nullptr;
     results->errorMessage       = nullptr;
 
 #if TARGET_IPHONE_SIMULATOR
@@ -679,14 +573,11 @@
     }
     else {
         // fast path: when cache is already mapped into shared region
-        bool hasError = false;
-        if ( reuseExistingCache(options, results) ) {
-            hasError = (results->errorMessage != nullptr);
-        } else {
-            // slow path: this is first process to load cache
-            hasError = mapCacheSystemWide(options, results);
-        }
-        return hasError;
+        if ( reuseExistingCache(options, results) )
+            return (results->errorMessage != nullptr);
+
+        // slow path: this is first process to load cache
+        return mapCacheSystemWide(options, results);
     }
 #endif
 }
@@ -697,84 +588,56 @@
     if ( loadInfo.loadAddress == nullptr )
         return false;
 
-    if ( loadInfo.loadAddress->header.formatVersion != dyld3::closure::kFormatVersion ) {
-        // support for older cache with a different Image* format
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
-        uint64_t hash = 0;
-        for (const char* s=dylibPathToFind; *s != '\0'; ++s)
-                hash += hash*4 + *s;
-#endif
+    // HACK: temp support for old caches
+    if ( (loadInfo.cachedDylibsGroup == nullptr) || (loadInfo.loadAddress->header.formatVersion != launch_cache::binary_format::kFormatVersion) ) {
         const dyld_cache_image_info* const start = (dyld_cache_image_info*)((uint8_t*)loadInfo.loadAddress + loadInfo.loadAddress->header.imagesOffset);
         const dyld_cache_image_info* const end = &start[loadInfo.loadAddress->header.imagesCount];
         for (const dyld_cache_image_info* p = start; p != end; ++p) {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
-            // on iOS, inode is used to hold hash of path
-            if ( (p->modTime == 0) && (p->inode != hash) )
-                continue;
-#endif
             const char* aPath = (char*)loadInfo.loadAddress + p->pathFileOffset;
             if ( strcmp(aPath, dylibPathToFind) == 0 ) {
                 results->mhInCache    = (const mach_header*)(p->address+loadInfo.slide);
                 results->pathInCache  = aPath;
                 results->slideInCache = loadInfo.slide;
-                results->image        = nullptr;
+                results->imageData    = nullptr;
                 return true;
             }
         }
         return false;
     }
-
-    const dyld3::closure::ImageArray* images = loadInfo.loadAddress->cachedDylibsImageArray();
-    results->image = nullptr;
-    uint32_t imageIndex;
-    if ( loadInfo.loadAddress->hasImagePath(dylibPathToFind, imageIndex) ) {
-        results->image = images->imageForNum(imageIndex+1);
-    }
- #if __MAC_OS_X_VERSION_MIN_REQUIRED
-    else {
-        // <rdar://problem/32740215> handle symlink to cached dylib
-        if ( loadInfo.loadAddress->header.dylibsExpectedOnDisk ) {
-            struct stat statBuf;
-            if ( dyld::my_stat(dylibPathToFind, &statBuf) == 0 ) {
-                // on macOS we store the inode and mtime of each dylib in the cache in the dyld_cache_image_info array
-                const dyld_cache_image_info* const start = (dyld_cache_image_info*)((uint8_t*)loadInfo.loadAddress + loadInfo.loadAddress->header.imagesOffset);
-                const dyld_cache_image_info* const end = &start[loadInfo.loadAddress->header.imagesCount];
-                for (const dyld_cache_image_info* p = start; p != end; ++p) {
-                    if ( (p->inode == statBuf.st_ino) && (p->modTime == statBuf.st_mtime) ) {
-                        imageIndex = (uint32_t)(p - start);
-                        results->image = images->imageForNum(imageIndex+1);
-                        break;
-                    }
-                }
-            }
-        }
-        else {
-            char resolvedPath[PATH_MAX];
-            if ( realpath(dylibPathToFind, resolvedPath) != nullptr ) {
-                if ( loadInfo.loadAddress->hasImagePath(resolvedPath, imageIndex) ) {
-                    results->image = images->imageForNum(imageIndex+1);
-                }
-            }
-        }
-    }
-#endif
-    if ( results->image == nullptr )
-        return false;
-
-    results->mhInCache    = (const mach_header*)((uintptr_t)loadInfo.loadAddress + results->image->cacheOffset());
-    results->pathInCache  = results->image->path();
+    // HACK: end
+
+    launch_cache::ImageGroup dylibsGroup(loadInfo.cachedDylibsGroup);
+    uint32_t foundIndex;
+    const launch_cache::binary_format::Image* imageData = dylibsGroup.findImageByPath(dylibPathToFind, foundIndex);
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
+    // <rdar://problem/32740215> handle symlink to cached dylib
+    if ( imageData == nullptr ) {
+        char resolvedPath[PATH_MAX];
+        if ( realpath(dylibPathToFind, resolvedPath) != nullptr )
+            imageData = dylibsGroup.findImageByPath(resolvedPath, foundIndex);
+    }
+#endif
+    if ( imageData == nullptr )
+        return false;
+
+    launch_cache::Image image(imageData);
+    results->mhInCache    = (const mach_header*)((uintptr_t)loadInfo.loadAddress + image.cacheOffset());
+    results->pathInCache  = image.path();
     results->slideInCache = loadInfo.slide;
+    results->imageData    = imageData;
     return true;
 }
 
 
 bool pathIsInSharedCacheImage(const SharedCacheLoadInfo& loadInfo, const char* dylibPathToFind)
 {
-    if ( (loadInfo.loadAddress == nullptr) || (loadInfo.loadAddress->header.formatVersion != closure::kFormatVersion) )
-        return false;
-
-    uint32_t imageIndex;
-    return loadInfo.loadAddress->hasImagePath(dylibPathToFind, imageIndex);
+    if ( (loadInfo.loadAddress == nullptr) || (loadInfo.cachedDylibsGroup == nullptr) || (loadInfo.loadAddress->header.formatVersion != launch_cache::binary_format::kFormatVersion) )
+        return false;
+
+    launch_cache::ImageGroup dylibsGroup(loadInfo.cachedDylibsGroup);
+    uint32_t foundIndex;
+    const launch_cache::binary_format::Image* imageData = dylibsGroup.findImageByPath(dylibPathToFind, foundIndex);
+    return (imageData != nullptr);
 }