[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/14] linux-user: Fix mq_open
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 06/14] linux-user: Fix mq_open |
Date: |
Thu, 16 Feb 2017 15:22:19 +0100 |
From: Lena Djokic <address@hidden>
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 <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/syscall.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 3e88dd1..c1d6f76 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -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);
- if (copy_from_user_mq_attr(&posix_mq_attr, arg4) != 0) {
- goto efault;
+ 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;
--
2.9.3
- Re: [Qemu-devel] [PULL 09/14] linux-user: Update m68k syscall definitions to match Linux 4.6, (continued)
- [Qemu-devel] [PULL 12/14] linux-user: fill target sigcontext struct accordingly, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 10/14] linux-user: fix settime old value location, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 08/14] linux-user: Update sh4 syscall definitions to match Linux 4.8, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 11/14] linux-user: fix tcg/mmap test, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 04/14] linux-user: Fix inotify_init1 support, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 02/14] linux-user: drop __cygwin__ ifdef, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 14/14] linux-user: Add FICLONE and FICLONERANGE ioctls, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 03/14] linux-user: Fix s390x safe-syscall for z900, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 06/14] linux-user: Fix mq_open,
Laurent Vivier <=
- [Qemu-devel] [PULL 05/14] linux-user: Fix readahead, Laurent Vivier, 2017/02/16