summaryrefslogtreecommitdiff
path: root/view/sharedcache/core/SharedCache.h
diff options
context:
space:
mode:
authorMark Rowe <mark@vector35.com>2026-02-23 23:26:27 -0800
committerMark Rowe <mark@vector35.com>2026-02-24 14:24:54 -0800
commita72b98ed5a357bb380d81f07f3f36946aa729bb2 (patch)
treeca48b3607721fa2c109b7989ae4b911bab89ea6d /view/sharedcache/core/SharedCache.h
parent3eda43f185a0411538745a99e251122e6a9192e0 (diff)
[DSC] Simplify file mapping to fix intermittent unrelocated pointers
The `FileAccessorCache`'s LRU eviction could discard a file's mapped data after slide info had already been applied to it. Future accesses to the file produced a fresh mapping, but failed to reapply the slide info. This could result in pointers not correctly being slid, such as in https://github.com/Vector35/binaryninja-api/issues/7689. The LRU cache existed to stay within OS file descriptor limits, since the old `MappedFile` held its fd open for the lifetime of the mapping. There's no real reason for it to hold the file descriptor open like this. Closing it after `mmap` is sufficient to avoid the file descriptor limits. `MappedFileRegion` replaces the combination of `FileAccessorCache`, `WeakFileAccessor`, and `MappedFileAccessor`. It closes the fd immediately after mmap, so all files can stay mapped without consuming descriptors, making the cache unnecessary. `MappedFileRegion` is owned directly by the `CacheEntry` for its full lifetime. Slide info is applied exactly once to each `MappedFileRegion`.
Diffstat (limited to 'view/sharedcache/core/SharedCache.h')
-rw-r--r--view/sharedcache/core/SharedCache.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/view/sharedcache/core/SharedCache.h b/view/sharedcache/core/SharedCache.h
index 010dff10..8ecd8f1d 100644
--- a/view/sharedcache/core/SharedCache.h
+++ b/view/sharedcache/core/SharedCache.h
@@ -1,5 +1,6 @@
#pragma once
+#include <shared_mutex>
#include <vector>
#include <Dyld.h>
@@ -127,10 +128,12 @@ class CacheEntry
// Mapping of image path to image info, used within ProcessImagesAndRegions to add them to the cache.
// Also used to retrieve the image dependencies.
std::vector<std::pair<std::string, dyld_cache_image_info>> m_images {};
+ std::shared_ptr<MappedFileRegion> m_file;
public:
CacheEntry(std::string filePath, std::string fileName, CacheEntryType type, dyld_cache_header header,
- std::vector<dyld_cache_mapping_info>&& mappings, std::vector<std::pair<std::string, dyld_cache_image_info>>&& images);
+ std::vector<dyld_cache_mapping_info> mappings, std::vector<std::pair<std::string, dyld_cache_image_info>> images,
+ std::shared_ptr<MappedFileRegion> file);
CacheEntry() = default;
CacheEntry(const CacheEntry&) = default;
@@ -141,7 +144,7 @@ public:
// Construct a cache entry from the file on disk.
static CacheEntry FromFile(const std::string& filePath, const std::string& fileName, CacheEntryType type);
- WeakFileAccessor GetAccessor() const;
+ const std::shared_ptr<MappedFileRegion>& GetFile() const { return m_file; }
// Get the headers virtual address.
// This is useful if you need to read relative to the start of the entry file.