summary refs log tree commit diff stats
path: root/linux-user/syscall.c
diff options
context:
space:
mode:
authorAleksandar Markovic <aleksandar.markovic@imgtec.com>2016-09-22 18:56:55 +0200
committerRiku Voipio <riku.voipio@linaro.org>2016-10-21 15:19:39 +0300
commitc7536ab679049ee90f94f5a18da451afeb41003c (patch)
tree2495a19f5431b764475e498e255bbf977e6266b2 /linux-user/syscall.c
parent19f59bcef91cd4abc04d10c9ecbf5183b71f1b06 (diff)
downloadfocaccia-qemu-c7536ab679049ee90f94f5a18da451afeb41003c.tar.gz
focaccia-qemu-c7536ab679049ee90f94f5a18da451afeb41003c.zip
linux-user: Fix mq_open() syscall support
Conversion of file creation flags (O_CREAT, ...) from target to host
was missing.

Also, this patch implements better error handling.

Signed-off-by: Aleksandar Markovic <aleksandar.markovic@imgtec.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user/syscall.c')
-rw-r--r--linux-user/syscall.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0379b8a21b..99be4f2f3e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11457,16 +11457,18 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 #if defined(TARGET_NR_mq_open) && defined(__NR_mq_open)
     case TARGET_NR_mq_open:
         {
-            struct mq_attr posix_mq_attr, *attrp;
+            struct mq_attr posix_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;
+            }
             p = lock_user_string(arg1 - 1);
-            if (arg4 != 0) {
-                copy_from_user_mq_attr (&posix_mq_attr, arg4);
-                attrp = &posix_mq_attr;
-            } else {
-                attrp = 0;
+            if (!p) {
+                goto efault;
             }
-            ret = get_errno(mq_open(p, arg2, arg3, attrp));
+            ret = get_errno(mq_open(p, host_flags, arg3, &posix_mq_attr));
             unlock_user (p, arg1, 0);
         }
         break;