OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: fix assertion in shmdt

Browse Source 
shmdt fails to call mmap_lock/mmap_unlock around page_set_flags,
resulting in the following assertion:
  page_set_flags: Assertion `have_mmap_lock()' failed.

Wrap shmdt internals into mmap_lock/mmap_unlock.

Cc: qemu-stable@nongnu.org
Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Max Filippov 2018-02-27 14:52:25 -08:00
parent e530acd7de
commit 21b869a321
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux-user/syscall.c
View File

@ -4947,6 +4947,9 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env,
static inline abi_long do_shmdt(abi_ulong shmaddr) static inline abi_long do_shmdt(abi_ulong shmaddr)
{ {
int i; int i;
abi_long rv;
mmap_lock();
for (i = 0; i < N_SHM_REGIONS; ++i) { for (i = 0; i < N_SHM_REGIONS; ++i) {
if (shm_regions[i].in_use && shm_regions[i].start == shmaddr) { if (shm_regions[i].in_use && shm_regions[i].start == shmaddr) {
@ -4955,8 +4958,11 @@ static inline abi_long do_shmdt(abi_ulong shmaddr)
break; break;
} }
} }
rv = get_errno(shmdt(g2h(shmaddr)));
return get_errno(shmdt(g2h(shmaddr))); mmap_unlock();
return rv;
} }
#ifdef TARGET_NR_ipc #ifdef TARGET_NR_ipc