[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v6 4/8] linux-user/syscall: Introduce target_soc
From: |
Laurent Vivier |
Subject: |
Re: [Qemu-devel] [PATCH v6 4/8] linux-user/syscall: Introduce target_sockaddr_nl |
Date: |
Mon, 9 Sep 2019 16:22:52 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 |
Le 08/09/2019 à 08:15, Philippe Mathieu-Daudé a écrit :
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> Tested-By: Guido Günther <address@hidden>
> ---
> linux-user/syscall.c | 6 ++++--
> linux-user/syscall_defs.h | 7 +++++++
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 8b41a03901..5128312db5 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -1494,8 +1494,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) {
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index 0662270300..fcedd0d0fb 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -153,6 +153,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;
> +};
You should use abi_ushort and abi_uint to keep alignments good (for
instance m68k aligns on 16bit whereas others on 32bit).
Thanks,
Laurent
- [Qemu-devel] [PATCH v6 0/8] linux-user: strace improvements, Philippe Mathieu-Daudé, 2019/09/08
- [Qemu-devel] [PATCH v6 5/8] linux-user/strace: Dump AF_NETLINK sockaddr content, Philippe Mathieu-Daudé, 2019/09/08
- [Qemu-devel] [PATCH v6 6/8] linux-user/strace: Add print_sockfd(), Philippe Mathieu-Daudé, 2019/09/08
- [Qemu-devel] [PATCH v6 7/8] linux-user/strace: Improve bind() output, Philippe Mathieu-Daudé, 2019/09/08
- [Qemu-devel] [PATCH v6 8/8] linux-user/strace: Let print_sockaddr() have a 'last' argument, Philippe Mathieu-Daudé, 2019/09/08
- Re: [Qemu-devel] [PATCH v6 0/8] linux-user: strace improvements, no-reply, 2019/09/08