ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Lena Djokic <Lena.Djokic@rt-rk.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Lena Djokic 2016-11-24 17:08:58 +01:00 committed by Laurent Vivier
parent 77c6850fd7
commit 2640077527
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
linux-user/syscall.c
View File

@ -11583,17 +11583,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_mq_open: case TARGET_NR_mq_open:
{ {
struct mq_attr posix_mq_attr; struct mq_attr posix_mq_attr;
struct mq_attr *pposix_mq_attr;
int host_flags; int host_flags;
host_flags = target_to_host_bitmask(arg2, fcntl_flags_tbl); host_flags = target_to_host_bitmask(arg2, fcntl_flags_tbl);
if (copy_from_user_mq_attr(&posix_mq_attr, arg4) != 0) { pposix_mq_attr = NULL;
goto efault; 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); p = lock_user_string(arg1 - 1);
if (!p) { if (!p) {
goto efault; 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); unlock_user (p, arg1, 0);
} }
break; break;