[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 01/16] linux-user: translate the result of getsoc
From: |
Paul Burton |
Subject: |
[Qemu-devel] [PATCH v3 01/16] linux-user: translate the result of getsockopt SO_TYPE |
Date: |
Sun, 22 Jun 2014 11:25:33 +0100 |
QEMU previously passed the result of the host syscall directly to the
target program. This is a problem if the host & target have different
representations of socket types, as is the case when running a MIPS
target program on an x86 host. Introduce a host_to_target_sock_type
helper function mirroring the existing target_to_host_sock_type, and
call it to translate the value provided by getsockopt when called for
the SO_TYPE option.
Signed-off-by: Paul Burton <address@hidden>
---
Changes in v3:
- Fix coding style, checkpatch clean.
Changes in v2:
- Remove indirection via a function pointer, and just call
host_to_target_sock_type directly.
---
linux-user/syscall.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7d74079..a157204 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -592,6 +592,37 @@ char *target_strerror(int err)
return strerror(target_to_host_errno(err));
}
+static inline int host_to_target_sock_type(int host_type)
+{
+ int target_type;
+
+ switch (host_type & 0xf /* SOCK_TYPE_MASK */) {
+ case SOCK_DGRAM:
+ target_type = TARGET_SOCK_DGRAM;
+ break;
+ case SOCK_STREAM:
+ target_type = TARGET_SOCK_STREAM;
+ break;
+ default:
+ target_type = host_type & 0xf /* SOCK_TYPE_MASK */;
+ break;
+ }
+
+#if defined(SOCK_CLOEXEC)
+ if (host_type & SOCK_CLOEXEC) {
+ target_type |= TARGET_SOCK_CLOEXEC;
+ }
+#endif
+
+#if defined(SOCK_NONBLOCK)
+ if (host_type & SOCK_NONBLOCK) {
+ target_type |= TARGET_SOCK_NONBLOCK;
+ }
+#endif
+
+ return target_type;
+}
+
static abi_ulong target_brk;
static abi_ulong target_original_brk;
static abi_ulong brk_page;
@@ -1636,6 +1667,9 @@ static abi_long do_getsockopt(int sockfd, int level, int
optname,
ret = get_errno(getsockopt(sockfd, level, optname, &val, &lv));
if (ret < 0)
return ret;
+ if (optname == SO_TYPE) {
+ val = host_to_target_sock_type(val);
+ }
if (len > lv)
len = lv;
if (len == 4) {
--
2.0.0
- [Qemu-devel] [PATCH v3 00/16] linux-user fixes & improvements, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 01/16] linux-user: translate the result of getsockopt SO_TYPE,
Paul Burton <=
- [Qemu-devel] [PATCH v3 02/16] linux-user: support SO_ACCEPTCONN getsockopt option, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 03/16] linux-user: support SO_{SND, RCV}BUFFORCE setsockopt options, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 05/16] linux-user: allow NULL arguments to mount, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 06/16] linux-user: support strace of epoll_create1, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 04/16] linux-user: support SO_PASSSEC setsockopt option, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 09/16] linux-user: allow NULL tv argument for settimeofday, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 07/16] linux-user: fix struct target_epoll_event layout for MIPS, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 10/16] linux-user: support timerfd_{create, gettime, settime} syscalls, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 08/16] linux-user: respect timezone for settimeofday, Paul Burton, 2014/06/22
- [Qemu-devel] [PATCH v3 11/16] linux-user: support ioprio_{get, set} syscalls, Paul Burton, 2014/06/22