fix: dont include xattr in extended link reading #278
Merged
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
jonathongardner
commented
Jan 23, 2025
| // account for the synlink target, plus 4 bytes for the xattr index after it | ||
| extra = int(binary.LittleEndian.Uint32(b[4:8])) + 4 | ||
| if len(b[target:]) > extra { | ||
| s.target = string(b[8 : 8+extra]) |
There was a problem hiding this comment.
This was reading 4 bytes to much (i.e. it was reading the xattr data as part of the target)
jonathongardner
commented
Jan 23, 2025
| extra = int(binary.LittleEndian.Uint32(b[4:8])) + 4 | ||
| if len(b[target:]) > extra { | ||
| s.target = string(b[8 : 8+extra]) | ||
| s.xAttrIndex = binary.LittleEndian.Uint32(b[8+extra : 8+extra+4]) |
There was a problem hiding this comment.
This was reading after the xattr data, so 4 bytes into the next section so it was just a random int
jonathongardner
commented
Jan 23, 2025
| @@ -532,7 +532,7 @@ func (fs *FileSystem) hydrateDirectoryEntries(entries []*directoryEntryRaw) ([]* | |||
| body, header := in.getBody(), in.getHeader() | |||
| xattrIndex, has := body.xattrIndex() | |||
| xattrs := map[string]string{} | |||
| if has && xattrIndex != noXattrInodeFlag { | |||
| if has { | |||
There was a problem hiding this comment.
When i was tracing down the bug i noticed all xattrIndex already do this check or return false so i removed it
deitch
approved these changes
Jan 27, 2025
|
Quite the catch. Thank you for tracking it down. |
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.
Got an error when trying to read another squashfs file from ubuntu. Not sure if I should have created an issue first. It was raising this error. Traced it down to a symlink reading the wrong part for the xattr.