qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: joel@jms.id.au, akihiko.odaki@daynix.com, laurent@vivier.eu,
	deller@gmx.de
Subject: [PATCH v8 01/17] linux-user: Unset MAP_FIXED_NOREPLACE for host
Date: Thu,  3 Aug 2023 18:45:01 -0700	[thread overview]
Message-ID: <20230804014517.6361-2-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230804014517.6361-1-richard.henderson@linaro.org>

From: Akihiko Odaki <akihiko.odaki@daynix.com>

Passing MAP_FIXED_NOREPLACE to host will fail for reserved_va because
the address space is reserved with mmap.  Replace it with MAP_FIXED
in that case.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-Id: <20230802071754.14876-2-akihiko.odaki@daynix.com>
[rth: Expand inline commentary.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/mmap.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index a5dfb56545..a11c630a7b 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -603,11 +603,26 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot,
             goto fail;
         }
 
-        /* Validate that the chosen range is empty. */
-        if ((flags & MAP_FIXED_NOREPLACE)
-            && !page_check_range_empty(start, last)) {
-            errno = EEXIST;
-            goto fail;
+        if (flags & MAP_FIXED_NOREPLACE) {
+            /* Validate that the chosen range is empty. */
+            if (!page_check_range_empty(start, last)) {
+                errno = EEXIST;
+                goto fail;
+            }
+
+            /*
+             * With reserved_va, the entire address space is mmaped in the
+             * host to ensure it isn't accidentally used for something else.
+             * We have just checked that the guest address is not mapped
+             * within the guest, but need to replace the host reservation.
+             *
+             * Without reserved_va, despite the guest address check above,
+             * keep MAP_FIXED_NOREPLACE so that the guest does not overwrite
+             * any host address mappings.
+             */
+            if (reserved_va) {
+                flags = (flags & ~MAP_FIXED_NOREPLACE) | MAP_FIXED;
+            }
         }
 
         /*
-- 
2.34.1



  reply	other threads:[~2023-08-04  1:48 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-04  1:45 [PATCH for-8.1 v8 00/17] linux-user: brk fixes Richard Henderson
2023-08-04  1:45 ` Richard Henderson [this message]
2023-08-04  1:45 ` [PATCH v8 02/17] linux-user: Fix MAP_FIXED_NOREPLACE on old kernels Richard Henderson
2023-08-04  1:45 ` [PATCH v8 03/17] linux-user: Do not call get_errno() in do_brk() Richard Henderson
2023-08-04  1:45 ` [PATCH v8 04/17] linux-user: Use MAP_FIXED_NOREPLACE for do_brk() Richard Henderson
2023-08-04  1:45 ` [PATCH v8 05/17] linux-user: Do nothing if too small brk is specified Richard Henderson
2023-08-04  1:45 ` [PATCH v8 06/17] linux-user: Do not align brk with host page size Richard Henderson
2023-08-04  1:45 ` [PATCH v8 07/17] linux-user: Remove last_brk Richard Henderson
2023-08-04  5:09   ` Akihiko Odaki
2023-08-04  8:51   ` Helge Deller
2023-08-04  1:45 ` [PATCH v8 08/17] linux-user: Adjust task_unmapped_base for reserved_va Richard Henderson
2023-08-04  5:14   ` Akihiko Odaki
2023-08-04  1:45 ` [PATCH v8 09/17] linux-user: Define TASK_UNMAPPED_BASE in $guest/target_mman.h Richard Henderson
2023-08-04  5:17   ` Akihiko Odaki
2023-08-04 10:17   ` Helge Deller
2023-08-04  1:45 ` [PATCH v8 10/17] linux-user: Define ELF_ET_DYN_BASE " Richard Henderson
2023-08-04  5:20   ` Akihiko Odaki
2023-08-04 14:09     ` Richard Henderson
2023-08-04  9:50   ` Helge Deller
2023-08-04 14:09     ` Richard Henderson
2023-08-04  1:45 ` [PATCH v8 11/17] linux-user: Use MAP_FIXED_NOREPLACE for initial image mmap Richard Henderson
2023-08-04  5:22   ` Akihiko Odaki
2023-08-04 10:18   ` Helge Deller
2023-08-04  1:45 ` [PATCH v8 12/17] linux-user: Use elf_et_dyn_base for ET_DYN with interpreter Richard Henderson
2023-08-04  5:24   ` Akihiko Odaki
2023-08-04 10:20   ` Helge Deller
2023-08-04  1:45 ` [PATCH v8 13/17] linux-user: Adjust initial brk when interpreter is close to executable Richard Henderson
2023-08-04  5:26   ` Akihiko Odaki
2023-08-04  1:45 ` [PATCH v8 14/17] linux-user: Properly set image_info.brk in flatload Richard Henderson
2023-08-04  5:27   ` Akihiko Odaki
2023-08-04 10:22   ` Helge Deller
2023-08-04  1:45 ` [PATCH v8 15/17] linux-user: Do not adjust image mapping for host page size Richard Henderson
2023-08-04  5:28   ` Akihiko Odaki
2023-08-04 10:23   ` Helge Deller
2023-08-04  1:45 ` [PATCH v8 16/17] linux-user: Do not adjust zero_bss " Richard Henderson
2023-08-04  5:56   ` Akihiko Odaki
2023-08-04 10:24   ` Helge Deller
2023-08-04  1:45 ` [PATCH v8 17/17] linux-user: Use zero_bss for PT_LOAD with no file contents too Richard Henderson
2023-08-04  6:02   ` Akihiko Odaki
2023-08-04 10:25   ` Helge Deller

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=20230804014517.6361-2-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=akihiko.odaki@daynix.com \
    --cc=deller@gmx.de \
    --cc=joel@jms.id.au \
    --cc=laurent@vivier.eu \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).