Fix dirent struct copy causing EXC_BAD_ACCESS in FileSystemService#602
Open
sentry[bot] wants to merge 1 commit into
Open
Fix dirent struct copy causing EXC_BAD_ACCESS in FileSystemService#602sentry[bot] wants to merge 1 commit into
sentry[bot] wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR addresses an
EXC_BAD_ACCESScrash occurring inFileSystemService.listDirectoryWithIgnoreDetection.Root Cause:
The
readdirsystem call can return a pointer to adirentrecord that is located near the end of a memory page. The original code copied the entiredirentstruct (which is over 1024 bytes) by value usingdirentPtr.pointee. When the record was near a page boundary, this copy operation would attempt to read past the end of the mapped memory page into unmapped memory, triggering aKERN_INVALID_ADDRESSpage fault.Solution:
To prevent the full struct copy, the
decodeDirentNamefunction has been refactored to accept anUnsafePointer<dirent>instead of adirentvalue. InsidedecodeDirentName,UnsafeRawPointerand byte offsets are now used to read only the necessary fields (d_namlen,d_reclen,d_type, andd_name) directly from the pointer, avoiding any large memory copy that could cross a page boundary. TheDecodedDirentNamestruct was updated to includedType.Additionally,
fileTypeFallbackanddescriptorRelativeModefunctions, which also accepteddirentby value, have been updated to acceptUnsafePointer<dirent>and readd_namebytes via raw pointer offsets. All call sites for these functions have been updated to pass theUnsafePointer<dirent>directly, eliminating the problematic.pointeedereference.Fixes REPOPROMPT-A9