[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/17] linux-user:Fix align mistake when mmap guest space
From: |
Laurent Vivier |
Subject: |
[PULL 01/17] linux-user:Fix align mistake when mmap guest space |
Date: |
Thu, 23 Jan 2020 09:22:11 +0100 |
From: Xinyu Li <address@hidden>
In init_guest_space, we need to mmap guest space. If the return address
of first mmap is not aligned with align, which was set to MAX(SHMLBA,
qemu_host_page_size), we need unmap and a new mmap(space is larger than
first size). The new size is named real_size, which is aligned_size +
qemu_host_page_size. alugned_size is the guest space size. And add a
qemu_host_page_size to avoid memory error when we align real_start
manually (ROUND_UP(real_start, align)). But when SHMLBA >
qemu_host_page_size, the added size will smaller than the size to align,
which can make a mistake(in a mips machine, it appears). So change
real_size from aligned_size +qemu_host_page_size
to aligned_size + align will solve it.
Signed-off-by: Xinyu Li <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
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 07b16cc0f470..511e4500788b 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2191,7 +2191,7 @@ unsigned long init_guest_space(unsigned long host_start,
* to where we need to put the commpage.
*/
munmap((void *)real_start, host_size);
- real_size = aligned_size + qemu_host_page_size;
+ real_size = aligned_size + align;
real_start = (unsigned long)
mmap((void *)real_start, real_size, PROT_NONE, flags, -1, 0);
if (real_start == (unsigned long)-1) {
--
2.24.1
- [PULL 00/17] Linux user for 5.0 patches, Laurent Vivier, 2020/01/23
- [PULL 05/17] linux-user: Add support for FS_IOC32_<GET|SET>VERSION ioctls, Laurent Vivier, 2020/01/23
- [PULL 04/17] linux-user: Add support for FS_IOC32_<GET|SET>FLAGS ioctls, Laurent Vivier, 2020/01/23
- [PULL 08/17] configure: Detect kcov support and introduce CONFIG_KCOV, Laurent Vivier, 2020/01/23
- [PULL 01/17] linux-user:Fix align mistake when mmap guest space,
Laurent Vivier <=
- [PULL 09/17] linux-user: Add support for KCOV_<ENABLE|DISABLE> ioctls, Laurent Vivier, 2020/01/23
- [PULL 10/17] linux-user: Add support for KCOV_INIT_TRACE ioctl, Laurent Vivier, 2020/01/23
- [PULL 06/17] linux-user: Add support for FD<SETEMSGTRESH|SETMAXERRS|GETMAXERRS> ioctls, Laurent Vivier, 2020/01/23
- [PULL 07/17] linux-user: Add support for FDFMT<BEG|TRK|END> ioctls, Laurent Vivier, 2020/01/23
- [PULL 03/17] linux-user: Add support for FS_IOC_<GET|SET>VERSION ioctls, Laurent Vivier, 2020/01/23
- [PULL 02/17] linux-user: Reserve space for brk, Laurent Vivier, 2020/01/23
- [PULL 14/17] linux-user: Add support for getting/setting RTC periodic interrupt and epoch using ioctls, Laurent Vivier, 2020/01/23
- [PULL 17/17] linux-user: Add support for read/clear RTC voltage low detector using ioctls, Laurent Vivier, 2020/01/23
- [PULL 11/17] linux-user: Add support for TYPE_LONG and TYPE_ULONG in do_ioctl(), Laurent Vivier, 2020/01/23
- [PULL 15/17] linux-user: Add support for getting/setting RTC wakeup alarm using ioctls, Laurent Vivier, 2020/01/23