[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/19] linux-user: translate the result of getsockopt
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 04/19] linux-user: translate the result of getsockopt SO_TYPE |
Date: |
Mon, 23 Jun 2014 16:26:19 +0300 |
From: Paul Burton <address@hidden>
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>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/syscall.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5c175ba..8d13781 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] [PULL 00/19] linux-user changes for 2.1, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 02/19] Add support for the arm breakpoint syscall, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 04/19] linux-user: translate the result of getsockopt SO_TYPE,
riku . voipio <=
- [Qemu-devel] [PULL 03/19] linux-user: added fake open() for /proc/self/cmdline, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 09/19] linux-user: support strace of epoll_create1, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 10/19] linux-user: fix struct target_epoll_event layout for MIPS, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 13/19] linux-user: support timerfd_{create, gettime, settime} syscalls, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 01/19] Add support for MAP_NORESERVE mmap flag., riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 17/19] linux-user: support the unshare syscall, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 12/19] linux-user: allow NULL tv argument for settimeofday, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 11/19] linux-user: respect timezone for settimeofday, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 05/19] linux-user: support SO_ACCEPTCONN getsockopt option, riku . voipio, 2014/06/23
- [Qemu-devel] [PULL 16/19] linux-user: support the setns syscall, riku . voipio, 2014/06/23