53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
|
From 6d4db685ae8b4cbffab80c61c01ef56c57b67eb4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: guping <guping_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 18 Nov 2024 03:09:59 +0000
|
||
|
|
Subject: [PATCH] linux-user: Tolerate CONFIG_LSM_MMAP_MIN_ADDR cherry-pick
|
||
|
|
from fb7f3572b111ffb6c2dd2c7f6c5b4dc57dd8a3f5
|
||
|
|
|
||
|
|
Running qemu-i386 on a system running with SELinux in enforcing mode
|
||
|
|
(more precisely: s390x trixie container on Fedora 40) fails with:
|
||
|
|
|
||
|
|
qemu-i386: tests/tcg/i386-linux-user/sigreturn-sigmask: Unable to find a guest_base to satisfy all guest address mapping requirements
|
||
|
|
00000000-ffffffff
|
||
|
|
|
||
|
|
The reason is that main() determines mmap_min_addr from
|
||
|
|
/proc/sys/vm/mmap_min_addr, but SELinux additionally defines
|
||
|
|
CONFIG_LSM_MMAP_MIN_ADDR, which is normally larger: 32K or 64K, but,
|
||
|
|
in general, can be anything. There is no portable way to query its
|
||
|
|
value: /boot/config, /proc/config and /proc/config.gz are distro- and
|
||
|
|
environment-specific.
|
||
|
|
|
||
|
|
Once the identity map fails, the magnitude of guest_base does not
|
||
|
|
matter, so fix by starting the search from 1M or 1G.
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Resolves: #2598
|
||
|
|
|
||
|
|
|
||
|
|
Suggested-by: default avatarRichard Henderson <richard.henderson@linaro.org>
|
||
|
|
Signed-off-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
|
||
|
|
Message-ID: <20241023002558.34589-1-iii@linux.ibm.com>
|
||
|
|
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
|
||
|
|
|
||
|
|
Signed-off-by: guping <guping_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
linux-user/elfload.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
|
||
|
|
index cf9e74468b..0df64c6442 100644
|
||
|
|
--- a/linux-user/elfload.c
|
||
|
|
+++ b/linux-user/elfload.c
|
||
|
|
@@ -2980,7 +2980,7 @@ static uintptr_t pgb_try_itree(const PGBAddrs *ga, uintptr_t base,
|
||
|
|
static uintptr_t pgb_find_itree(const PGBAddrs *ga, IntervalTreeRoot *root,
|
||
|
|
uintptr_t align, uintptr_t brk)
|
||
|
|
{
|
||
|
|
- uintptr_t last = mmap_min_addr;
|
||
|
|
+ uintptr_t last = sizeof(uintptr_t) == 4 ? MiB : GiB;
|
||
|
|
uintptr_t base, skip;
|
||
|
|
|
||
|
|
while (true) {
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|