qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 01/14] linux-user/flatload: Take mmap_lock in load_flt_binary()
Date: Tue,  8 Oct 2024 11:51:28 -0700	[thread overview]
Message-ID: <20241008185141.20057-2-richard.henderson@linaro.org> (raw)
In-Reply-To: <20241008185141.20057-1-richard.henderson@linaro.org>

From: Philippe Mathieu-Daudé <philmd@linaro.org>

load_flt_binary() calls load_flat_file() -> page_set_flags().

page_set_flags() must be called with the mmap_lock held,
otherwise it aborts:

  $ qemu-arm -L stm32/lib/ stm32/bin/busybox
  qemu-arm: ../accel/tcg/user-exec.c:505: page_set_flags: Assertion `have_mmap_lock()' failed.
  Aborted (core dumped)

Fix by taking the lock in load_flt_binary().

Fixes: fbd3c4cff6 ("linux-user/arm: Mark the commpage executable")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2525
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240822095045.72643-3-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/flatload.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index 04d8138d12..0e4be5bf44 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -487,7 +487,10 @@ int load_flt_binary(struct linux_binprm *bprm, struct image_info *info)
     stack_len += (bprm->envc + 1) * 4; /* the envp array */
 
 
+    mmap_lock();
     res = load_flat_file(bprm, libinfo, 0, &stack_len);
+    mmap_unlock();
+
     if (is_error(res)) {
             return res;
     }
-- 
2.43.0



  reply	other threads:[~2024-10-08 18:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-08 18:51 [PULL 00/14] tcg + linux-user patch queue Richard Henderson
2024-10-08 18:51 ` Richard Henderson [this message]
2024-10-08 18:51 ` [PULL 02/14] linux-user: Fix parse_elf_properties GNU0_MAGIC check Richard Henderson
2024-10-08 18:51 ` [PULL 03/14] linux-user: add openat2 support in linux-user Richard Henderson
2024-10-08 18:51 ` [PULL 04/14] linux-user: add strace support for openat2 Richard Henderson
2024-10-08 18:51 ` [PULL 05/14] linux-user: Trace wait4()'s and waitpid()'s wstatus Richard Henderson
2024-10-08 18:51 ` [PULL 06/14] linux-user: Correct print_sockaddr() format Richard Henderson
2024-10-08 18:51 ` [PULL 07/14] linux-user: Display sockaddr buffer as pointer Richard Henderson
2024-10-08 18:51 ` [PULL 08/14] linux-user: Factor print_buf_len() out Richard Henderson
2024-10-08 18:51 ` [PULL 09/14] linux-user: Add strace for sendto() Richard Henderson
2024-10-08 18:51 ` [PULL 10/14] linux-user: Add strace for recvfrom() Richard Henderson
2024-10-08 18:51 ` [PULL 11/14] tcg/ppc: Use TCG_REG_TMP2 for scratch tcg_out_qemu_st Richard Henderson
2024-10-08 18:51 ` [PULL 12/14] tcg/ppc: Use TCG_REG_TMP2 for scratch index in prepare_host_addr Richard Henderson
2024-10-08 18:51 ` [PULL 13/14] target/m68k: Always return a temporary from gen_lea_mode Richard Henderson
2024-10-08 18:51 ` [PULL 14/14] accel/tcg: Make page_set_flags() documentation public Richard Henderson
2024-10-09 19:11 ` [PULL 00/14] tcg + linux-user patch queue 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=20241008185141.20057-2-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --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).