diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/mmap2.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/mmap2.patch | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/mmap2.patch b/meta/recipes-devtools/qemu/qemu/mmap2.patch index 1652131757..e115473b70 100644 --- a/meta/recipes-devtools/qemu/qemu/mmap2.patch +++ b/meta/recipes-devtools/qemu/qemu/mmap2.patch | |||
@@ -13,27 +13,26 @@ rather than ENOMEM so adjust the other part of the test to this. | |||
13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] | 13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] |
14 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org | 14 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org |
15 | 15 | ||
16 | Index: qemu-5.2.0/linux-user/mmap.c | 16 | Index: qemu-6.0.0/linux-user/mmap.c |
17 | =================================================================== | 17 | =================================================================== |
18 | --- qemu-5.2.0.orig/linux-user/mmap.c | 18 | --- qemu-6.0.0.orig/linux-user/mmap.c |
19 | +++ qemu-5.2.0/linux-user/mmap.c | 19 | +++ qemu-6.0.0/linux-user/mmap.c |
20 | @@ -722,12 +722,14 @@ abi_long target_mremap(abi_ulong old_add | 20 | @@ -733,12 +733,16 @@ abi_long target_mremap(abi_ulong old_add |
21 | int prot; | 21 | int prot; |
22 | void *host_addr; | 22 | void *host_addr; |
23 | 23 | ||
24 | - if (!guest_range_valid(old_addr, old_size) || | 24 | - if (!guest_range_valid_untagged(old_addr, old_size) || |
25 | - ((flags & MREMAP_FIXED) && | 25 | - ((flags & MREMAP_FIXED) && |
26 | - !guest_range_valid(new_addr, new_size)) || | 26 | + if (!guest_range_valid_untagged(old_addr, old_size)) { |
27 | - ((flags & MREMAP_MAYMOVE) == 0 && | ||
28 | - !guest_range_valid(old_addr, new_size))) { | ||
29 | - errno = ENOMEM; | ||
30 | + if (!guest_range_valid(old_addr, old_size)) { | ||
31 | + errno = EFAULT; | 27 | + errno = EFAULT; |
32 | + return -1; | 28 | + return -1; |
33 | + } | 29 | + } |
34 | + | 30 | + |
35 | + if (((flags & MREMAP_FIXED) && !guest_range_valid(new_addr, new_size)) || | 31 | + if (((flags & MREMAP_FIXED) && |
36 | + ((flags & MREMAP_MAYMOVE) == 0 && !guest_range_valid(old_addr, new_size))) { | 32 | !guest_range_valid_untagged(new_addr, new_size)) || |
33 | ((flags & MREMAP_MAYMOVE) == 0 && | ||
34 | !guest_range_valid_untagged(old_addr, new_size))) { | ||
35 | - errno = ENOMEM; | ||
37 | + errno = EINVAL; | 36 | + errno = EINVAL; |
38 | return -1; | 37 | return -1; |
39 | } | 38 | } |