Prevent overflow with pre-allocated RAM blocks #1712
Closed
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
wtdcode
reviewed
Sep 25, 2022
| @@ -1100,6 +1098,9 @@ RAMBlock *qemu_ram_alloc_from_ptr(struct uc_struct *uc, ram_addr_t size, void *h | |||
| new_block->host = host; | |||
| if (host) { | |||
| new_block->flags |= RAM_PREALLOC; | |||
| } else { | |||
| size = HOST_PAGE_ALIGN(uc, size); | |||
There was a problem hiding this comment.
The fix looks promising but assigning values to size and max_size seems doing nothing?
There was a problem hiding this comment.
Yes, you're right. The max_length assignment should have moved down as well.
|
Fixed in 32a3a68 |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This is a proposed resolution for one of the test issues discussed in #1678. Not only does it fix the failing unit test on hosts with page size larger than 4K, I believe it also fixes a defect where pre-allocated RAM could be resized inadvertently beyond the actual allocated memory by the
HOST_PAGE_ALIGNmacro.