motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-27 12:02:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-user: Fix signed math overflow in brk() syscall

Browse source 
Fix the math overflow when calculating the new_malloc_size.

new_host_brk_page and brk_page are unsigned integers. If userspace
reduces the heap, new_host_brk_page is lower than brk_page which results
in a huge positive number (but should actually be negative).

Fix it by adding a proper check and as such make the code more readable.

Signed-off-by: Helge Deller <deller@gmx.de>
Tested-by: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Fixes: 86f04735ac ("linux-user: Fix brk() to release pages")
Cc: qemu-stable@nongnu.org
Buglink: https://github.com/upx/upx/issues/683
(cherry picked from commit eac78a4b0b)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Helge Deller 2023-07-17 12:39:38 +02:00 • committed by Michael Tokarev
parent c4a4731408
commit f90a8b9357
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
linux-user/syscall.c
View file

@ -860,12 +860,13 @@ abi_long do_brk(abi_ulong brk_val)
* itself); instead we treat "mapped but at wrong address" as
* a failure and unmap again.
*/
new_alloc_size = new_host_brk_page - brk_page;
if (new_alloc_size) {
if (new_host_brk_page > brk_page) {
new_alloc_size = new_host_brk_page - brk_page;
mapped_addr = get_errno(target_mmap(brk_page, new_alloc_size,
PROT_READ|PROT_WRITE,
MAP_ANON|MAP_PRIVATE, 0, 0));
} else {
new_alloc_size = 0;
mapped_addr = brk_page;
}