[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/12] linux-user/syscall: Introduce target_socka
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 06/12] linux-user/syscall: Introduce target_sockaddr_nl |
Date: |
Tue, 3 Jul 2018 12:33:40 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Tested-By: Guido Günther <address@hidden>
---
linux-user/syscall_defs.h | 7 +++++++
linux-user/syscall.c | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 40bb60ef4c..5a0b76721f 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -152,6 +152,13 @@ struct target_sockaddr_un {
uint8_t sun_path[108];
};
+struct target_sockaddr_nl {
+ uint16_t nl_family; /* AF_NETLINK */
+ uint16_t __pad;
+ uint32_t nl_pid;
+ uint32_t nl_groups;
+};
+
struct target_in_addr {
uint32_t s_addr; /* big endian */
};
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ad40682cee..9a11f8c4a6 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1696,8 +1696,10 @@ static inline abi_long host_to_target_sockaddr(abi_ulong
target_addr,
sizeof(target_saddr->sa_family)) {
target_saddr->sa_family = tswap16(addr->sa_family);
}
- if (addr->sa_family == AF_NETLINK && len >= sizeof(struct sockaddr_nl)) {
- struct sockaddr_nl *target_nl = (struct sockaddr_nl *)target_saddr;
+ if (addr->sa_family == AF_NETLINK &&
+ len >= sizeof(struct target_sockaddr_nl)) {
+ struct target_sockaddr_nl *target_nl =
+ (struct target_sockaddr_nl *)target_saddr;
target_nl->nl_pid = tswap32(target_nl->nl_pid);
target_nl->nl_groups = tswap32(target_nl->nl_groups);
} else if (addr->sa_family == AF_PACKET) {
--
2.18.0
- [Qemu-devel] [PATCH v4 00/12] linux-user: strace improvements, Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 01/12] linux-user/syscall: Verify recvfrom(addr) is user-writable, Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 02/12] linux-user/strace: Improve capget()/capset() output, Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 05/12] linux-user/strace: Improve settimeofday(), Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 06/12] linux-user/syscall: Introduce target_sockaddr_nl,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 09/12] linux-user/strace: Add print_sockfd(), Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 08/12] linux-user/strace: Improve recvmsg() output, Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 10/12] linux-user/strace: Let print_sockaddr() have a 'last' argument, Philippe Mathieu-Daudé, 2018/07/03