Re: [PATCH v2 2/4] linux-user: fix sockaddr_in6 endianness

[Laurent Vivier]

Le 07/03/2023 à 12:27, Mathis MARION a écrit :
> On 06/03/2023 22:52, Laurent Vivier wrote:
> > CAUTION: This email originated from outside of the organization. Do not click links or open 
> > attachments unless you recognize the sender and know the content is safe.
> >
> >
> > Le 20/02/2023 à 09:58, Mathis Marion a écrit :
> > > From: Mathis Marion <mathis.marion@silabs.com>
> > >
> > > Fields sin6_flowinfo and sin6_scope_id use the host byte order, so there
> > > is a conversion to be made when host and target endianness differ.
> > >
> > > Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
> > > ---
> > >   linux-user/syscall.c | 6 ++++++
> > >   1 file changed, 6 insertions(+)
> > >
> > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> > > index 58549de125..1a6856abec 100644
> > > --- a/linux-user/syscall.c
> > > +++ b/linux-user/syscall.c
> > > @@ -1713,6 +1713,12 @@ static inline abi_long target_to_host_sockaddr(int fd, 
> > > struct sockaddr *addr,
> > >       lladdr = (struct target_sockaddr_ll *)addr;
> > >       lladdr->sll_ifindex = tswap32(lladdr->sll_ifindex);
> > >       lladdr->sll_hatype = tswap16(lladdr->sll_hatype);
> > > +    } else if (sa_family == AF_INET6) {
> > > +        struct sockaddr_in6 *in6addr;
> > > +
> > > +        in6addr = (struct sockaddr_in6 *)addr;
> > > +        in6addr->sin6_flowinfo = tswap32(in6addr->sin6_flowinfo);
> >
> > In /usr/include/linux/in6.h, it's defined as a __be32, so I don't think we need 
> > to change its
> > endianness.
>
> Right.
> Thank you for integrating the other patches! Before I send a v3, do you
> have any comments on patch 4?

Yes, use *_MASK rather than ~*_NESTED. It looks cleaner. I prefer to ignore flags rather than return 
an error, so on architectures with same endiannes/wordsize it generally works.

Thanks,
Laurent