All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Riku Voipio <riku.voipio@iki.fi>,
	Jonathan Marler <johnnymarler@gmail.com>,
	Laurent Vivier <laurent@vivier.eu>
Subject: [PULL v2 05/19] linux-user/mmap.c: fix integer underflow in target_mremap
Date: Sat,  6 Jun 2020 15:15:53 +0200	[thread overview]
Message-ID: <20200606131607.1250819-6-laurent@vivier.eu> (raw)
In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu>

From: Jonathan Marler <johnnymarler@gmail.com>

Fixes: https://bugs.launchpad.net/bugs/1876373

This code path in mmap occurs when a page size is decreased with mremap.  When a section of pages is shrunk, qemu calls mmap_reserve on the pages that were released.  However, it has the diff operation reversed, subtracting the larger old_size from the smaller new_size.  Instead, it should be subtracting the smaller new_size from the larger old_size.  You can also see in the previous line of the change that this mmap_reserve call only occurs when old_size > new_size.

Bug: https://bugs.launchpad.net/qemu/+bug/1876373
Signed-off-by: Jonathan Marler <johnnymarler@gmail.com>
Reviewded-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200502161225.14346-1-johnnymarler@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/mmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index e37803379747..caab62909eb1 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -708,7 +708,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
         if (prot == 0) {
             host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
             if (host_addr != MAP_FAILED && reserved_va && old_size > new_size) {
-                mmap_reserve(old_addr + old_size, new_size - old_size);
+                mmap_reserve(old_addr + old_size, old_size - new_size);
             }
         } else {
             errno = ENOMEM;
-- 
2.26.2



  parent reply	other threads:[~2020-06-06 13:23 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-06 13:15 [PULL v2 00/19] Linux user for 5.1 patches Laurent Vivier
2020-06-06 13:15 ` [PULL v2 01/19] linux-user, alpha: fix oldumount syscall Laurent Vivier
2020-06-06 13:15 ` [PULL v2 02/19] linux-user: return target error codes for socket() and prctl() Laurent Vivier
2020-06-06 13:15 ` [PULL v2 03/19] linux-user: Add support for /proc/cpuinfo on hppa platform Laurent Vivier
2020-06-06 13:15 ` [PULL v2 04/19] linux-user/strace.list: fix epoll_create{, 1} -strace output Laurent Vivier
2020-06-06 13:15 ` Laurent Vivier [this message]
2020-06-06 13:15 ` [PULL v2 06/19] linux-user: implement OFD locks Laurent Vivier
2020-06-06 13:15 ` [PULL v2 07/19] Makefile: Only build virtiofsd if system-mode is enabled Laurent Vivier
2020-06-06 13:15 ` [PULL v2 08/19] configure: Avoid building TCG when not needed Laurent Vivier
2020-06-06 13:15 ` [PULL v2 09/19] tests/Makefile: Only display TCG-related tests when TCG is available Laurent Vivier
2020-06-06 13:15 ` [PULL v2 10/19] tests/Makefile: Restrict some softmmu-only tests Laurent Vivier
2020-06-06 13:15 ` [PULL v2 11/19] util/Makefile: Reduce the user-mode object list Laurent Vivier
2020-06-06 13:16 ` [PULL v2 12/19] stubs/Makefile: " Laurent Vivier
2020-06-06 13:16 ` [PULL v2 13/19] target/riscv/cpu: Restrict CPU migration to system-mode Laurent Vivier
2020-06-06 13:16 ` [PULL v2 14/19] exec: Assert CPU migration is not used on user-only build Laurent Vivier
2020-06-06 13:16 ` [PULL v2 15/19] arch_init: Remove unused 'qapi-commands-misc.h' include Laurent Vivier
2020-06-06 13:16 ` [PULL v2 16/19] target/i386: Restrict CpuClass::get_crash_info() to system-mode Laurent Vivier
2020-06-06 13:16 ` [PULL v2 17/19] target/s390x: " Laurent Vivier
2020-06-06 13:16 ` [PULL v2 18/19] hw/core: " Laurent Vivier
2020-06-06 13:16 ` [PULL v2 19/19] stubs: Restrict ui/win32-kbd-hook " Laurent Vivier
2020-06-08 12:31 ` [PULL v2 00/19] Linux user for 5.1 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200606131607.1250819-6-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=johnnymarler@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=riku.voipio@iki.fi \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.