1From 375cae3dd6151ef33cae8f243f6a2c2da6c0c356 Mon Sep 17 00:00:00 2001 2From: Richard Purdie <richard.purdie@linuxfoundation.org> 3Date: Fri, 8 Jan 2021 17:27:06 +0000 4Subject: [PATCH 06/12] qemu: Add some user space mmap tweaks to address musl 5 32 bit 6 7When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an 8infinite loop of mremap calls of ever decreasing/increasing addresses. 9 10I suspect something in the musl memory allocation code loops indefinitely 11if it only sees ENOMEM and only exits when it hits EFAULT. 12 13According to the docs, trying to mremap outside the address space 14can/should return EFAULT and changing this allows the build to succeed. 15 16A better return value for the other cases of invalid addresses is EINVAL 17rather than ENOMEM so adjust the other part of the test to this. 18 19Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] 20Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org 21 22--- 23 linux-user/mmap.c | 10 +++++++--- 24 1 file changed, 7 insertions(+), 3 deletions(-) 25 26Index: qemu-8.0.0/linux-user/mmap.c 27=================================================================== 28--- qemu-8.0.0.orig/linux-user/mmap.c 29+++ qemu-8.0.0/linux-user/mmap.c 30@@ -776,12 +776,16 @@ abi_long target_mremap(abi_ulong old_add 31 int prot; 32 void *host_addr; 33 34- if (!guest_range_valid_untagged(old_addr, old_size) || 35- ((flags & MREMAP_FIXED) && 36+ if (!guest_range_valid_untagged(old_addr, old_size)) { 37+ errno = EFAULT; 38+ return -1; 39+ } 40+ 41+ if (((flags & MREMAP_FIXED) && 42 !guest_range_valid_untagged(new_addr, new_size)) || 43 ((flags & MREMAP_MAYMOVE) == 0 && 44 !guest_range_valid_untagged(old_addr, new_size))) { 45- errno = ENOMEM; 46+ errno = EINVAL; 47 return -1; 48 } 49 50