[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 3/5] linux-user: add a function hook to translate
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH v3 3/5] linux-user: add a function hook to translate sockaddr |
Date: |
Wed, 28 Oct 2015 21:40:44 +0100 |
Signed-off-by: Laurent Vivier <address@hidden>
---
v3: insert fd_trans_target_to_host_addr() into target_to_host_sockaddr() and
pass fd.
linux-user/syscall.c | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 41b85b4..a313846 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -296,9 +296,11 @@ static bitmask_transtbl fcntl_flags_tbl[] = {
};
typedef abi_long (*TargetFdDataFunc)(void *, size_t);
+typedef abi_long (*TargetFdAddrFunc)(void *, abi_ulong, socklen_t);
typedef struct TargetFdTrans {
TargetFdDataFunc host_to_target_data;
TargetFdDataFunc target_to_host_data;
+ TargetFdAddrFunc target_to_host_addr;
} TargetFdTrans;
static TargetFdTrans **target_fd_trans;
@@ -313,6 +315,14 @@ static TargetFdDataFunc fd_trans_host_to_target_data(int
fd)
return NULL;
}
+static TargetFdAddrFunc fd_trans_target_to_host_addr(int fd)
+{
+ if (fd < target_fd_max && target_fd_trans[fd]) {
+ return target_fd_trans[fd]->target_to_host_addr;
+ }
+ return NULL;
+}
+
static void fd_trans_register(int fd, TargetFdTrans *trans)
{
unsigned int oldmax;
@@ -1162,7 +1172,7 @@ static inline abi_long target_to_host_ip_mreq(struct
ip_mreqn *mreqn,
return 0;
}
-static inline abi_long target_to_host_sockaddr(struct sockaddr *addr,
+static inline abi_long target_to_host_sockaddr(int fd, struct sockaddr *addr,
abi_ulong target_addr,
socklen_t len)
{
@@ -1170,6 +1180,10 @@ static inline abi_long target_to_host_sockaddr(struct
sockaddr *addr,
sa_family_t sa_family;
struct target_sockaddr *target_saddr;
+ if (fd_trans_target_to_host_addr(fd)) {
+ return fd_trans_target_to_host_addr(fd)(addr, target_addr, len);
+ }
+
target_saddr = lock_user(VERIFY_READ, target_addr, len, 1);
if (!target_saddr)
return -TARGET_EFAULT;
@@ -2115,7 +2129,7 @@ static abi_long do_bind(int sockfd, abi_ulong target_addr,
addr = alloca(addrlen+1);
- ret = target_to_host_sockaddr(addr, target_addr, addrlen);
+ ret = target_to_host_sockaddr(sockfd, addr, target_addr, addrlen);
if (ret)
return ret;
@@ -2135,7 +2149,7 @@ static abi_long do_connect(int sockfd, abi_ulong
target_addr,
addr = alloca(addrlen+1);
- ret = target_to_host_sockaddr(addr, target_addr, addrlen);
+ ret = target_to_host_sockaddr(sockfd, addr, target_addr, addrlen);
if (ret)
return ret;
@@ -2155,8 +2169,9 @@ static abi_long do_sendrecvmsg_locked(int fd, struct
target_msghdr *msgp,
if (msgp->msg_name) {
msg.msg_namelen = tswap32(msgp->msg_namelen);
msg.msg_name = alloca(msg.msg_namelen+1);
- ret = target_to_host_sockaddr(msg.msg_name, tswapal(msgp->msg_name),
- msg.msg_namelen);
+ ret = target_to_host_sockaddr(fd, msg.msg_name,
+ tswapal(msgp->msg_name),
+ msg.msg_namelen);
if (ret) {
goto out2;
}
@@ -2418,7 +2433,7 @@ static abi_long do_sendto(int fd, abi_ulong msg, size_t
len, int flags,
return -TARGET_EFAULT;
if (target_addr) {
addr = alloca(addrlen+1);
- ret = target_to_host_sockaddr(addr, target_addr, addrlen);
+ ret = target_to_host_sockaddr(fd, addr, target_addr, addrlen);
if (ret) {
unlock_user(host_msg, msg, 0);
return ret;
--
2.4.3
- [Qemu-devel] [PATCH v3 0/5] linux-user: manage SOCK_PACKET socket type, Laurent Vivier, 2015/10/28
- [Qemu-devel] [PATCH v3 4/5] linux-user: manage bind with a socket of SOCK_PACKET type., Laurent Vivier, 2015/10/28
- [Qemu-devel] [PATCH v3 5/5] linux-user: check fd is >= 0 in fd_trans_host_to_target_data/fd_trans_host_to_target_addr, Laurent Vivier, 2015/10/28
- [Qemu-devel] [PATCH v3 1/5] linux-user: SOCK_PACKET uses network endian to encode protocol in socket(), Laurent Vivier, 2015/10/28
- [Qemu-devel] [PATCH v3 2/5] linux-user: rename TargetFdFunc to TargetFdDataFunc, and structure fields accordingly, Laurent Vivier, 2015/10/28
- [Qemu-devel] [PATCH v3 3/5] linux-user: add a function hook to translate sockaddr,
Laurent Vivier <=
- Re: [Qemu-devel] [PATCH v3 0/5] linux-user: manage SOCK_PACKET socket type, Peter Maydell, 2015/10/28