From: "Alex Bennée" <alex.bennee@linaro.org>
To: Vincent Fazio <vfazio@xes-inc.com>
Cc: qemu-trivial@nongnu.org, laurent@vivier.eu,
Vincent Fazio <vfazio@gmail.com>,
qemu-devel@nongnu.org
Subject: Re: [PATCH] linux-user/elfload: do not assume MAP_FIXED_NOREPLACE kernel support
Date: Sun, 14 Feb 2021 11:24:57 +0000 [thread overview]
Message-ID: <87o8gmc2k5.fsf@linaro.org> (raw)
In-Reply-To: <20210131061930.14554-1-vfazio@xes-inc.com>
Vincent Fazio <vfazio@xes-inc.com> writes:
> From: Vincent Fazio <vfazio@gmail.com>
>
> Previously, pgd_find_hole_fallback assumed that if the build host's libc
> had MAP_FIXED_NOREPLACE defined that the address returned by mmap would
> match the requested address. This is not a safe assumption for Linux
> kernels prior to 4.17
It doesn't as we have in osdep.h:
#ifndef MAP_FIXED_NOREPLACE
#define MAP_FIXED_NOREPLACE 0
#endif
which is to say to assume if MAP_FIXED_NOREPLACE is defined the kernel
should have given us what we want otherwise we do the check.
>
> Now, we always compare mmap's resultant address with the requested
> address and no longer short-circuit based on MAP_FIXED_NOREPLACE.
>
> Fixes: 2667e069e7b5 ("linux-user: don't use MAP_FIXED in pgd_find_hole_fallback")
> Signed-off-by: Vincent Fazio <vfazio@gmail.com>
> ---
> linux-user/elfload.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/linux-user/elfload.c b/linux-user/elfload.c
> index 5f5f23d2e5..8d425f9ed0 100644
> --- a/linux-user/elfload.c
> +++ b/linux-user/elfload.c
> @@ -2217,8 +2217,7 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t guest_size, uintptr_t brk,
> PROT_NONE, flags, -1, 0);
> if (mmap_start != MAP_FAILED) {
> munmap(mmap_start, guest_size);
> - if (MAP_FIXED_NOREPLACE != 0 ||
> - mmap_start == (void *) align_start) {
> + if (mmap_start == (void *) align_start) {
> return (uintptr_t) mmap_start + offset;
> }
> }
--
Alex Bennée
next prev parent reply other threads:[~2021-02-14 11:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-31 6:19 [PATCH] linux-user/elfload: do not assume MAP_FIXED_NOREPLACE kernel support Vincent Fazio
2021-02-13 21:44 ` Laurent Vivier
2021-02-14 11:24 ` Alex Bennée [this message]
2021-02-14 12:50 ` Laurent Vivier
2021-02-14 14:20 ` Vincent Fazio
2021-02-15 9:52 ` Alex Bennée
2021-02-25 14:26 ` Vincent Fazio
2021-03-09 20:36 ` Laurent Vivier
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=87o8gmc2k5.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=vfazio@gmail.com \
--cc=vfazio@xes-inc.com \
/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).