[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 08/23] bsd-user/mmap.c: Implement MAP_EXCL, required by jemallo
From: |
Warner Losh |
Subject: |
[PULL v2 08/23] bsd-user/mmap.c: Implement MAP_EXCL, required by jemalloc in head |
Date: |
Mon, 18 Oct 2021 13:01:00 -0600 |
From: Kyle Evans <kevans@FreeBSD.org>
jemalloc requires a working MAP_EXCL. Ensure that no page is double
mapped when specified. In addition, use guest_range_valid_untagged to
test for valid ranges of pages rather than an incomplete inlined version
of the test that might be wrong.
Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/mmap.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 4ecd949a10..5b6ed5eed1 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -574,12 +574,10 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int
prot,
* It can fail only on 64-bit host with 32-bit target.
* On any other target/host host mmap() handles this error correctly.
*/
-#if TARGET_ABI_BITS == 32 && HOST_LONG_BITS == 64
- if ((unsigned long)start + len - 1 > (abi_ulong) -1) {
+ if (!guest_range_valid_untagged(start, len)) {
errno = EINVAL;
goto fail;
}
-#endif
/*
* worst case: we cannot map the file because the offset is not
@@ -614,6 +612,12 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int
prot,
goto the_end;
}
+ /* Reject the mapping if any page within the range is mapped */
+ if ((flags & MAP_EXCL) && page_check_range(start, len, 0) < 0) {
+ errno = EINVAL;
+ goto fail;
+ }
+
/* handle the start of the mapping */
if (start > real_start) {
if (real_end == real_start + qemu_host_page_size) {
--
2.32.0
- [PULL v2 00/23] Pull bsd user 20211018 patches, Warner Losh, 2021/10/18
- [PULL v2 01/23] bsd-user/mmap.c: Always zero MAP_ANONYMOUS memory in mmap_frag(), Warner Losh, 2021/10/18
- [PULL v2 03/23] bsd-user/mmap.c: MAP_ symbols are defined, so no need for ifdefs, Warner Losh, 2021/10/18
- [PULL v2 06/23] bsd-user/mmap.c: Convert to qemu_log logging for mmap debugging, Warner Losh, 2021/10/18
- [PULL v2 08/23] bsd-user/mmap.c: Implement MAP_EXCL, required by jemalloc in head,
Warner Losh <=
- [PULL v2 09/23] bsd-user/mmap.c: assert that target_mprotect cannot fail, Warner Losh, 2021/10/18
- [PULL v2 04/23] bsd-user/mmap.c: mmap return ENOMEM on overflow, Warner Losh, 2021/10/18
- [PULL v2 02/23] bsd-user/mmap.c: check pread's return value to fix warnings with _FORTIFY_SOURCE, Warner Losh, 2021/10/18
- [PULL v2 05/23] bsd-user/mmap.c: mmap prefer MAP_ANON for BSD, Warner Losh, 2021/10/18
- [PULL v2 11/23] bsd-user/target_os-user.h: Remove support for FreeBSD older than 12.0, Warner Losh, 2021/10/18
- [PULL v2 10/23] meson: *-user: only descend into *-user when configured, Warner Losh, 2021/10/18
- [PULL v2 13/23] bsd-user: TARGET_RESET define is unused, remove it, Warner Losh, 2021/10/18
- [PULL v2 12/23] bsd-user/strace.list: Remove support for FreeBSD versions older than 12.0, Warner Losh, 2021/10/18
- [PULL v2 07/23] bsd-user/mmap.c: Don't mmap fd == -1 independently from MAP_ANON flag, Warner Losh, 2021/10/18
- [PULL v2 14/23] bsd-user: export get_errno and is_error from syscall.c, Warner Losh, 2021/10/18