]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
linux-user: fix sockaddr_in6 endianness
authorMathis Marion <mathis.marion@silabs.com>
Tue, 7 Mar 2023 15:42:55 +0000 (16:42 +0100)
committerMichael Tokarev <mjt@tls.msk.ru>
Mon, 10 Apr 2023 08:34:41 +0000 (11:34 +0300)
The sin6_scope_id field uses 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>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230307154256.101528-2-Mathis.Marion@silabs.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
(cherry picked from commit 44cf6731d6b9a48bcd57392e8cd6f0f712aaa677)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
linux-user/syscall.c

index 24b25759beabbe76d7582b99bfe76d9096326149..106d5ed05b8b2d696b5fd62d1c4534af6832bd56 100644 (file)
@@ -1755,6 +1755,11 @@ 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_scope_id = tswap32(in6addr->sin6_scope_id);
     }
     unlock_user(target_saddr, target_addr, 0);