From: Matthew Lugg <[email protected]> If an address range given to `mremap` is invalid (exceeds addressing bounds on the guest), we were previously returning `ENOMEM`, which is not correct. The manpage and the Linux kernel implementation both agree that if `old_addr`/`old_size` refer to an invalid address, `EFAULT` is returned, and if `new_addr`/`new_size` refer to an invalid address, `EINVAL` is returned.
Signed-off-by: Matthew Lugg <[email protected]> Signed-off-by: Richard Henderson <[email protected]> Message-ID: <[email protected]> (cherry picked from commit 2422884ec5a12037d2378f45ca1411d3f37c7081) Signed-off-by: Michael Tokarev <[email protected]> diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 703f8ca3cd..dc28470054 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -1108,12 +1108,15 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, int prot; void *host_addr; - if (!guest_range_valid_untagged(old_addr, old_size) || - ((flags & MREMAP_FIXED) && + if (((flags & MREMAP_FIXED) && !guest_range_valid_untagged(new_addr, new_size)) || ((flags & MREMAP_MAYMOVE) == 0 && !guest_range_valid_untagged(old_addr, new_size))) { - errno = ENOMEM; + errno = EINVAL; + return -1; + } + if (!guest_range_valid_untagged(old_addr, old_size)) { + errno = EFAULT; return -1; } -- 2.47.3
