Squashfs: fix error format when file larger than block size #287
Conversation
This file contains 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
12 tasks
Xynnn007
force-pushed
the
fix-offset
branch
2 times, most recently
from
52b3567 to
0ae63bc
Compare
|
@deitch Hey, now it passes with your test case, so I include the 2 test commits |
|
I really would have enjoyed having you around when I was trying to figure out how squashfs worked under the covers. Happy to have you now, though. Can you rebase this on master, so it includes just your changes, not the first 2 commits? |
Due to SquashFS, the first field of both File inode and extended file inode is called 'blocks start', that means ``` The offset from the start of the archive to the first data block. ``` Link https://dr-emann.github.io/squashfs/squashfs.html#_file_inodes Signed-off-by: Xynnn007 <[email protected]>
The granularity of fragment data writing is block, so we don't need to return an unaligned fragment amount but 'sized chunks' everytime we write a fragmentdata block, the variable location should be added with a size of 'blocksize', which means that we have written a new fragment block. The variable `location` will be reused to tell new accumulated fragmentblocks position. Signed-off-by: Xynnn007 <[email protected]>
The variable fragmentData is used to record if the current fragment data is enough to occupy a block. Once a block is written, it should be cleared for a new round of loop. Signed-off-by: Xynnn007 <[email protected]>
Due to spec, frag index of file inode https://dr-emann.github.io/squashfs/squashfs.html#_file_inodes ``` An index into the Fragment Table which describes the fragment block that the tail end of this file is stored in. If not used, this is set to 0xFFFFFFFF. ``` Signed-off-by: Xynnn007 <[email protected]>
Signed-off-by: Xynnn007 <[email protected]>
|
Rebased. |
deitch
approved these changes
Mar 10, 2025
|
Great, thanks. I will rebase my test on it. |
|
@deitch Shall we cut another release for this? We downstream can depend on the bug fix |
|
Sure. |
|
What do you use it for downstream? |
|
v1.5.2 on its way |
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.
https://dr-emann.github.io/squashfs/squashfs.html#_file_inodes
Due to SquashFS spec, file inode's 'blocks start' field means the offset from the beginning of the file.
This commit also fixes the fragmentData location calculation.
Finally, due to Spec, if a file does not have fragment data, its frag index should be all 0xF.
Fixes #282