Commit 21b869a3 authored by Max Filippov's avatar Max Filippov
Browse files

linux-user: fix assertion in shmdt 



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: default avatarLaurent Vivier <laurent@vivier.eu>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent e530acd7

linux-user/syscall.c

+7 −1
Original line number Diff line number Diff line
@@ -4947,6 +4947,9 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, 
static inline abi_long do_shmdt(abi_ulong shmaddr)

{

    int i;

    abi_long rv;



    mmap_lock();



    for (i = 0; i < N_SHM_REGIONS; ++i) {

        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;

        }

    }

    rv = get_errno(shmdt(g2h(shmaddr)));



    mmap_unlock();



    return get_errno(shmdt(g2h(shmaddr)));

    return rv;

}



#ifdef TARGET_NR_ipc