diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-12-15 15:18:00 +0000 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2018-01-23 14:20:52 +0100 |
| commit | 10fa993aae539fa8d0da1da17169e05f1dfb4f95 (patch) | |
| tree | 7a02d9ede63aac44a06dd385a6237e25c96bf0cd /linux-user/syscall.c | |
| parent | ad762b990fa9da53e203b934583838d4dd371e20 (diff) | |
| download | focaccia-qemu-10fa993aae539fa8d0da1da17169e05f1dfb4f95.tar.gz focaccia-qemu-10fa993aae539fa8d0da1da17169e05f1dfb4f95.zip | |
linux-user: Translate flags argument to dup3 syscall
The third argument to dup3() is a flags word which may be O_CLOEXEC. We weren't translating this flag from target to host value, which meant that if the target used a different value from the host (eg sparc guest and x86 host) the dup3() call would fail EINVAL. Do the correct translation. Fixes: https://bugs.launchpad.net/qemu/+bug/1704658 Reported-by: Bruno Haible <bruno@clisp.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <1513351080-25917-1-git-send-email-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 39553c81b6..41ded90ee6 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8490,11 +8490,19 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #endif #if defined(CONFIG_DUP3) && defined(TARGET_NR_dup3) case TARGET_NR_dup3: - ret = get_errno(dup3(arg1, arg2, arg3)); + { + int host_flags; + + if ((arg3 & ~TARGET_O_CLOEXEC) != 0) { + return -EINVAL; + } + host_flags = target_to_host_bitmask(arg3, fcntl_flags_tbl); + ret = get_errno(dup3(arg1, arg2, host_flags)); if (ret >= 0) { fd_trans_dup(arg1, arg2); } break; + } #endif #ifdef TARGET_NR_getppid /* not on alpha */ case TARGET_NR_getppid: |