erofs: Fix reading directory entries #188
Open
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
Read inline inode entries if not empty Signed-off-by: Pragyan Poudyal <[email protected]>
cgwalters
approved these changes
Oct 13, 2025
| } | ||
|
|
||
| if inode.mode().is_dir() { | ||
| if !inode.inline().is_empty() { |
There was a problem hiding this comment.
Did you have a reason to change the traversal ordering too so the tail block is traversed first?
| this.visit_nid(&img, nid)?; | ||
| } | ||
| Ok(this.objects) | ||
| } |
There was a problem hiding this comment.
FTR I think it'd be relatively straightforward to generate unit tests for all of this code.
allisonkarlitskaya
requested changes
Oct 14, 2025
cgwalters
added a commit
to cgwalters/composefs-rs
that referenced
this pull request
Oct 15, 2025
…ry bug Add a comprehensive regression test that reproduces the bug fixed in PR inline directory sections as DirectoryBlock, causing a panic. The test generates an erofs image on-the-fly using C mkcomposefs, which (unlike the Rust implementation) creates directories with empty inline sections. This reveals a key difference: the C implementation stores only the parent reference without . and .. entries when a directory is empty, while the Rust implementation always includes those entries. The test demonstrates both: 1. A synthetic case showing DirectoryBlock::n_entries() panics on empty inline data 2. The actual bug triggered by collect_objects() on the C-generated image The test is marked #[ignore] so it doesn't break CI until PR containers#188's fix is applied. When run with --ignored, it passes by catching the expected panics. Asissted-by: Claude Code Signed-off-by: Colin Walters <[email protected]>
|
Can we land #189 and then this can be rebased on top ? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Read inline inode entries if not empty