Skip to content

Bound the page count in the large-run free path (Zend/zend_alloc.c) #23772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jvoisin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bound the page count in the large-run free path (Zend/zend_alloc.c) #23772

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Zend/zend_alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,11 @@ static zend_always_inline void zend_mm_delete_chunk(zend_mm_heap *heap, zend_mm_

static zend_always_inline void zend_mm_free_pages_ex(zend_mm_heap *heap, zend_mm_chunk *chunk, uint32_t page_num, uint32_t pages_count, int free_chunk)
{
/* pages_count is decoded from a page map entry or a caller-supplied size, both of which
* may be corrupted. An out-of-range run would make the updates below reach past free_map
* into the rest of the chunk header. */
ZEND_MM_CHECK(page_num >= ZEND_MM_FIRST_PAGE && pages_count != 0
&& page_num + pages_count <= ZEND_MM_PAGES, "zend_mm_heap corrupted");
chunk->free_pages += pages_count;
zend_mm_bitset_reset_range(chunk->free_map, page_num, pages_count);
chunk->map[page_num] = 0;
Expand Down
Loading