-
Notifications
You must be signed in to change notification settings - Fork 372
fix(simd_path): clamp resolve_ptrs iteration to buf.len() to prevent OOB panic #652
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
elee7420-gif
wants to merge
1
commit into
dmtrKovalenko:main
from
elee7420-gif:fix/resolve-ptrs-bounds
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wait but this gives us max 32 * 128 bytes = 4096 bytes which is max file size ever available
how is it possible that the indicies array contains more elements
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gustav-fff do you have any ideas?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[triage-bot] DIRECTED:
Buffer holds 32 pointers, each pointing to one
SimdChunk.SIMD_CHUNK_BYTES = 16(crates/fff-core/src/simd_path.rs:7), not 128 — so 32 chunks cover only32 * 16 = 512bytes, not 4096.Path capacity is
PATH_BUF_SIZE(crates/fff-core/src/constants.rs:36-39):libc::PATH_MAX= 4096 → up to 256 chunkslibc::PATH_MAX= 1024 → up to 64 chunksChunkedString::indicesis aSmallVec<[u32; 4]>with no cap, soindices.len()can legitimately reach 64 (macOS) or 256 (Linux/Windows). Any path >512 bytes trips the OOB. The reporter's 500+ byte path on macOS is well withinPATH_MAXbut exceeds the pointer buffer.The clamp in this PR is a truncation-based band-aid: paths >512 bytes get scored on their first 512 bytes only, which silently degrades fuzzy match quality for long paths (rare, but real on deeply-nested monorepos).
Proper fix options:
PATH_BUF_SIZE / SIMD_CHUNK_BYTES(256 on Linux, 64 on macOS) at every call site inscore.rs:35,63,69,176,202. Stack cost: 256 * 8 = 2 KiB per scoring frame — acceptable for a scoring hot path that already reserves large buffers.byte_len > 512at index time soresolve_ptrsnever sees them. Cheaper but loses matching on legitimate long paths.I'd lean (1) — a fixed
[*const u8; 256]array inscore.rsmatches the actualPATH_BUF_SIZEinvariant and needs no runtime check. Want me to push that instead of the truncation?Honk-Honk 🪿
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ooops this is a real mistake, we have to have a compile time buffer size per the platform limits not 512 bytes