[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/40] linux-user: Explicitly untag memory management syscalls
From: |
Peter Maydell |
Subject: |
[PULL 13/40] linux-user: Explicitly untag memory management syscalls |
Date: |
Tue, 16 Feb 2021 16:16:31 +0000 |
From: Richard Henderson <richard.henderson@linaro.org>
We define target_mmap et al as untagged, so that they can be
used from the binary loaders. Explicitly call cpu_untagged_addr
for munmap, mprotect, mremap syscall entry points.
Add a few comments for the syscalls that are exempted by the
kernel's tagged-address-abi.rst.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210212184902.1251044-14-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
linux-user/syscall.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index e7fd99f1acc..d5badd753e3 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -894,6 +894,8 @@ abi_long do_brk(abi_ulong new_brk)
abi_long mapped_addr;
abi_ulong new_alloc_size;
+ /* brk pointers are always untagged */
+
DEBUGF_BRK("do_brk(" TARGET_ABI_FMT_lx ") -> ", new_brk);
if (!new_brk) {
@@ -4599,6 +4601,8 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env,
int i,ret;
abi_ulong shmlba;
+ /* shmat pointers are always untagged */
+
/* find out the length of the shared memory segment */
ret = get_errno(shmctl(shmid, IPC_STAT, &shm_info));
if (is_error(ret)) {
@@ -4666,6 +4670,8 @@ static inline abi_long do_shmdt(abi_ulong shmaddr)
int i;
abi_long rv;
+ /* shmdt pointers are always untagged */
+
mmap_lock();
for (i = 0; i < N_SHM_REGIONS; ++i) {
@@ -9703,6 +9709,7 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
v5, v6));
}
#else
+ /* mmap pointers are always untagged */
ret = get_errno(target_mmap(arg1, arg2, arg3,
target_to_host_bitmask(arg4,
mmap_flags_tbl),
arg5,
@@ -9721,8 +9728,10 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
return get_errno(ret);
#endif
case TARGET_NR_munmap:
+ arg1 = cpu_untagged_addr(cpu, arg1);
return get_errno(target_munmap(arg1, arg2));
case TARGET_NR_mprotect:
+ arg1 = cpu_untagged_addr(cpu, arg1);
{
TaskState *ts = cpu->opaque;
/* Special hack to detect libc making the stack executable. */
@@ -9737,6 +9746,8 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
return get_errno(target_mprotect(arg1, arg2, arg3));
#ifdef TARGET_NR_mremap
case TARGET_NR_mremap:
+ arg1 = cpu_untagged_addr(cpu, arg1);
+ /* mremap new_addr (arg5) is always untagged */
return get_errno(target_mremap(arg1, arg2, arg3, arg4, arg5));
#endif
/* ??? msync/mlock/munlock are broken for softmmu. */
--
2.20.1
- [PULL 04/40] exec: Use uintptr_t in cpu_ldst.h, (continued)
- [PULL 04/40] exec: Use uintptr_t in cpu_ldst.h, Peter Maydell, 2021/02/16
- [PULL 02/40] linux-user: Introduce PAGE_ANON, Peter Maydell, 2021/02/16
- [PULL 08/40] bsd-user: Tidy VERIFY_READ/VERIFY_WRITE, Peter Maydell, 2021/02/16
- [PULL 09/40] linux-user: Do not use guest_addr_valid for h2g_valid, Peter Maydell, 2021/02/16
- [PULL 05/40] exec: Improve types for guest_addr_valid, Peter Maydell, 2021/02/16
- [PULL 06/40] linux-user: Check for overflow in access_ok, Peter Maydell, 2021/02/16
- [PULL 10/40] linux-user: Fix guest_addr_valid vs reserved_va, Peter Maydell, 2021/02/16
- [PULL 07/40] linux-user: Tidy VERIFY_READ/VERIFY_WRITE, Peter Maydell, 2021/02/16
- [PULL 11/40] exec: Introduce cpu_untagged_addr, Peter Maydell, 2021/02/16
- [PULL 12/40] exec: Use cpu_untagged_addr in g2h; split out g2h_untagged, Peter Maydell, 2021/02/16
- [PULL 13/40] linux-user: Explicitly untag memory management syscalls,
Peter Maydell <=
- [PULL 14/40] linux-user: Use guest_range_valid in access_ok, Peter Maydell, 2021/02/16
- [PULL 15/40] exec: Rename guest_{addr,range}_valid to *_untagged, Peter Maydell, 2021/02/16
- [PULL 16/40] linux-user: Use cpu_untagged_addr in access_ok; split out *_untagged, Peter Maydell, 2021/02/16
- [PULL 17/40] linux-user: Move lock_user et al out of line, Peter Maydell, 2021/02/16
- [PULL 18/40] linux-user: Fix types in uaccess.c, Peter Maydell, 2021/02/16
- [PULL 19/40] linux-user: Handle tags in lock_user/unlock_user, Peter Maydell, 2021/02/16
- [PULL 20/40] linux-user/aarch64: Implement PR_TAGGED_ADDR_ENABLE, Peter Maydell, 2021/02/16
- [PULL 21/40] target/arm: Improve gen_top_byte_ignore, Peter Maydell, 2021/02/16
- [PULL 22/40] target/arm: Use the proper TBI settings for linux-user, Peter Maydell, 2021/02/16