[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v7 4/9] linux-user/syscall: Introduce target_sockaddr_nl
From: |
Laurent Vivier |
Subject: |
Re: [PATCH v7 4/9] linux-user/syscall: Introduce target_sockaddr_nl |
Date: |
Mon, 21 Oct 2019 11:42:06 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 |
Le 15/09/2019 à 23:39, Philippe Mathieu-Daudé a écrit :
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> Tested-By: Guido Günther <address@hidden>
> ---
> v7: use abi_ushort and abi_uint to keep alignments good (lvivier)
> ---
> 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 e2af3c1494..f1ab81b917 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -1496,8 +1496,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 fa69c6ab8d..7694d72446 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 {
> + abi_ushort nl_family; /* AF_NETLINK */
> + abi_ushort __pad;
> + abi_uint nl_pid;
> + abi_uint nl_groups;
> +};
> +
> struct target_in_addr {
> uint32_t s_addr; /* big endian */
> };
>
Reviewed-by: Laurent Vivier <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH v7 4/9] linux-user/syscall: Introduce target_sockaddr_nl,
Laurent Vivier <=