SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

linux-user: Fix do_shmat type errors

Browse Source 
The guest address, raddr, should be unsigned, aka abi_ulong.
The host addresses should be cast via *intptr_t not long.
Drop the inline and fix two other whitespace issues.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Anton Johansson <anjo@rev.ng>
Message-Id: <20230626140250.69572-1-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-06-26 16:02:50 +02:00
parent 7a8d9f3a0e
commit 9b61f77f40
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linux-user/syscall.c
View File

@ -4539,14 +4539,14 @@ static inline abi_ulong target_shmlba(CPUArchState *cpu_env)
} }
#endif #endif
static inline abi_ulong do_shmat(CPUArchState *cpu_env, static abi_ulong do_shmat(CPUArchState *cpu_env, int shmid,
int shmid, abi_ulong shmaddr, int shmflg) abi_ulong shmaddr, int shmflg)
{ {
CPUState *cpu = env_cpu(cpu_env); CPUState *cpu = env_cpu(cpu_env);
abi_long raddr; abi_ulong raddr;
void *host_raddr; void *host_raddr;
struct shmid_ds shm_info; struct shmid_ds shm_info;
int i,ret; int i, ret;
abi_ulong shmlba; abi_ulong shmlba;
/* shmat pointers are always untagged */ /* shmat pointers are always untagged */
@ -4602,9 +4602,9 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env,
if (host_raddr == (void *)-1) { if (host_raddr == (void *)-1) {
mmap_unlock(); mmap_unlock();
return get_errno((long)host_raddr); return get_errno((intptr_t)host_raddr);
} }
raddr=h2g((unsigned long)host_raddr); raddr = h2g((uintptr_t)host_raddr);
page_set_flags(raddr, raddr + shm_info.shm_segsz - 1, page_set_flags(raddr, raddr + shm_info.shm_segsz - 1,
PAGE_VALID | PAGE_RESET | PAGE_READ | PAGE_VALID | PAGE_RESET | PAGE_READ |
@ -4621,7 +4621,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env,
mmap_unlock(); mmap_unlock();
return raddr; return raddr;
} }
static inline abi_long do_shmdt(abi_ulong shmaddr) static inline abi_long do_shmdt(abi_ulong shmaddr)