Commit 26400775 authored by Lena Djokic's avatar Lena Djokic Committed by Laurent Vivier
Browse files

linux-user: Fix mq_open 



If fourth argument is NULL it should be passed without
using lock_user function which would, in that case, return
EFAULT, and system call supports passing NULL as fourth argument.

Signed-off-by: default avatarLena Djokic <Lena.Djokic@rt-rk.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent 77c6850f

linux-user/syscall.c

+8 −3
Original line number Diff line number Diff line
@@ -11583,17 +11583,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
    case TARGET_NR_mq_open:

        {

            struct mq_attr posix_mq_attr;

            struct mq_attr *pposix_mq_attr;

            int host_flags;



            host_flags = target_to_host_bitmask(arg2, fcntl_flags_tbl);

            pposix_mq_attr = NULL;

            if (arg4) {

                if (copy_from_user_mq_attr(&posix_mq_attr, arg4) != 0) {

                    goto efault;

                }

                pposix_mq_attr = &posix_mq_attr;

            }

            p = lock_user_string(arg1 - 1);

            if (!p) {

                goto efault;

            }

            ret = get_errno(mq_open(p, host_flags, arg3, &posix_mq_attr));

            ret = get_errno(mq_open(p, host_flags, arg3, pposix_mq_attr));

            unlock_user (p, arg1, 0);

        }

        break;