| Message ID | 20190915213924.22223-5-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | linux-user: strace improvements | expand |
Le 15/09/2019 à 23:39, Philippe Mathieu-Daudé a écrit : > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Tested-By: Guido Günther <agx@sigxcpu.org> > --- > 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 <laurent@vivier.eu>
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 */ };