Fix fpe and heap buffer overflow #3922
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
ret2libc
reviewed
Oct 13, 2023
XVilka
approved these changes
Oct 14, 2023
wargio
reviewed
Oct 14, 2023
librz/bin/format/le/le.c
Outdated
| @@ -1128,6 +1128,7 @@ static RzVector /*<LE_map>*/ *le_create_maps(rz_bin_le_obj_t *bin) { | |||
| rz_vector_foreach(le_maps, m) { | |||
| max_vaddr = RZ_MAX(max_vaddr, m->vaddr + m->vsize); | |||
| } | |||
| CHECK(h->pagesize); | |||
| bin->reloc_target_map_base = max_vaddr - max_vaddr % h->pagesize + h->pagesize * 2; | |||
There was a problem hiding this comment.
add parenthesis for better reading.
wargio
reviewed
Oct 14, 2023
librz/bin/format/pyc/marshal.c
Outdated
Comment on lines
697
to
699
| ut32 n; | ||
|
|
||
| n = get_ut32(buffer, &error); |
There was a problem hiding this comment.
Suggested change
| ut32 n; | |
| n = get_ut32(buffer, &error); | |
| ut32 n = get_ut32(buffer, &error); |
wargio
reviewed
Oct 14, 2023
librz/bin/format/pyc/marshal.c
Outdated
Comment on lines
682
to
684
| ut32 n = 0; | ||
|
|
||
| n = get_ut32(buffer, &error); |
There was a problem hiding this comment.
Suggested change
| ut32 n = 0; | |
| n = get_ut32(buffer, &error); | |
| ut32 n = get_ut32(buffer, &error); |
wargio
reviewed
Oct 14, 2023
librz/bin/format/pyc/marshal.c
Outdated
Comment on lines
703
to
704
| } | ||
| if (error) { |
There was a problem hiding this comment.
Suggested change
| } | |
| if (error) { | |
| } else if (error) { |
wargio
approved these changes
Oct 15, 2023
ttxine
force-pushed
the
fix-fpe-and-heap-buffer-overflow
branch
from
d64ea2a to
b3d5863
Compare
wargio
approved these changes
Oct 16, 2023
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.
Your checklist for this pull request
Detailed description
le_create_maps()didn't check forh->pagesizeto be non-zero.get_ascii_object()andget_ascii_interned_object()didn't checknto be less or equal thanST32_MAX. This could lead to heap buffer overflow inget_bytes().Test plan
CI is green