One mmap patch was merged upstream, the other is in progress but after discussion has been amended and resent. Update the patches as such.
Signed-off-by: Richard Purdie <[email protected]> --- meta/recipes-devtools/qemu/qemu/mmap.patch | 2 +- meta/recipes-devtools/qemu/qemu/mmap2.patch | 26 ++++++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu/mmap.patch b/meta/recipes-devtools/qemu/qemu/mmap.patch index 0f7d2ce04c2..edd9734f30a 100644 --- a/meta/recipes-devtools/qemu/qemu/mmap.patch +++ b/meta/recipes-devtools/qemu/qemu/mmap.patch @@ -9,7 +9,7 @@ avoid asserting binaries when reserved_va is set. This meant a test case now gives the same behaviour regardless of whether reserved_va is set or not. -Upstream-Status: Pending +Upstream-Status: Backport [https://github.com/qemu/qemu/commit/ccc5ccc17f8cfbfd87d9aede5d12a2d47c56e712] Signed-off-by: Richard Purdie <[email protected] Index: qemu-5.2.0/linux-user/mmap.c diff --git a/meta/recipes-devtools/qemu/qemu/mmap2.patch b/meta/recipes-devtools/qemu/qemu/mmap2.patch index 9d40565938f..1652131757b 100644 --- a/meta/recipes-devtools/qemu/qemu/mmap2.patch +++ b/meta/recipes-devtools/qemu/qemu/mmap2.patch @@ -6,21 +6,35 @@ if it only sees ENOMEM and only exits when it hits EFAULT. According to the docs, trying to mremap outside the address space can/should return EFAULT and changing this allows the build to succeed. -Whether this should be fixed in qemu and/or musl, not sure. -Upstream-Status: Pending +A better return value for the other cases of invalid addresses is EINVAL +rather than ENOMEM so adjust the other part of the test to this. + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] Signed-off-by: Richard Purdie <[email protected] Index: qemu-5.2.0/linux-user/mmap.c =================================================================== --- qemu-5.2.0.orig/linux-user/mmap.c +++ qemu-5.2.0/linux-user/mmap.c -@@ -727,7 +727,7 @@ abi_long target_mremap(abi_ulong old_add - !guest_range_valid(new_addr, new_size)) || - ((flags & MREMAP_MAYMOVE) == 0 && - !guest_range_valid(old_addr, new_size))) { +@@ -722,12 +722,14 @@ abi_long target_mremap(abi_ulong old_add + int prot; + void *host_addr; + +- if (!guest_range_valid(old_addr, old_size) || +- ((flags & MREMAP_FIXED) && +- !guest_range_valid(new_addr, new_size)) || +- ((flags & MREMAP_MAYMOVE) == 0 && +- !guest_range_valid(old_addr, new_size))) { - errno = ENOMEM; ++ if (!guest_range_valid(old_addr, old_size)) { + errno = EFAULT; ++ return -1; ++ } ++ ++ if (((flags & MREMAP_FIXED) && !guest_range_valid(new_addr, new_size)) || ++ ((flags & MREMAP_MAYMOVE) == 0 && !guest_range_valid(old_addr, new_size))) { ++ errno = EINVAL; return -1; } -- 2.27.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148187): https://lists.openembedded.org/g/openembedded-core/message/148187 Mute This Topic: https://lists.openembedded.org/mt/80686339/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
