Commit c7128c9f authored by Petar Jovanovic's avatar Petar Jovanovic Committed by Riku Voipio
Browse files

linux-user: change do_semop to return target errno when unsuccessful 



do_semop() is called from two places, and one of these fails to convert
return error to target errno when semop fails. This patch changes the
function to always return target errno in case of an unsuccessful call.

Signed-off-by: default avatarPetar Jovanovic <petar.jovanovic@imgtec.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent 09dada40

linux-user/syscall.c

+2 −2
Original line number Diff line number Diff line
@@ -2764,7 +2764,7 @@ static inline abi_long do_semop(int semid, abi_long ptr, unsigned nsops) 
    if (target_to_host_sembuf(sops, ptr, nsops))

        return -TARGET_EFAULT;



    return semop(semid, sops, nsops);

    return get_errno(semop(semid, sops, nsops));

}



struct target_msqid_ds
@@ -6957,7 +6957,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
#endif

#ifdef TARGET_NR_semop

    case TARGET_NR_semop:

        ret = get_errno(do_semop(arg1, arg2, arg3));

        ret = do_semop(arg1, arg2, arg3);

        break;

#endif

#ifdef TARGET_NR_semctl