parse_root_dir: Verify size of extra obtained #169
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
* Fix the issue gdraheim#164 where extra_ptr could be alocated without enough bytes to check the magic value. Signed-off-by: vlefebvre <valentin.lefebvre@suse.com>
keentux
force-pushed
the
parse-root-dir-extra
branch
from
706c502 to
550e30e
Compare
|
Also fix issue #166 |
gdraheim
added a commit
that referenced
this pull request
Aug 8, 2024
|
Some tests failed and showed that there are zip files around that do not encode the full ZIP64 entries block. |
|
Oh, Thanks for the verification. |
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.
Fix the #164 where extra_ptr could be alocated without enough bytes to check the magic value.
Indeed, ZZIP_EXTRA_ZIP64_CHECK, or later in the code, will call ZZIP_GETEXTRA() where it get 2 first bytes to check the magic number.
However, there is not any verification about the size allocated for
extras_ptr, where by the value ofu_extras,extras_ptrcould be allocated of 1 byte (what happened with the provided POC in the bug description). We should be sure thatu_extraallocates theextras_ptrwith more that 2 bytes, or better, at least same value of the size of thezzip_extra_zip64struct.