From nobody Tue May 7 03:53:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487457205654975.5314174581781; Sat, 18 Feb 2017 14:33:25 -0800 (PST) Received: from localhost ([::1]:60006 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfDZE-0003wf-48 for importer@patchew.org; Sat, 18 Feb 2017 17:33:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfDXj-0003MQ-TD for qemu-devel@nongnu.org; Sat, 18 Feb 2017 17:31:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cfDXf-00022G-16 for qemu-devel@nongnu.org; Sat, 18 Feb 2017 17:31:51 -0500 Received: from mout.gmx.net ([212.227.15.19]:60986) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cfDXe-00020m-M8 for qemu-devel@nongnu.org; Sat, 18 Feb 2017 17:31:46 -0500 Received: from ls3530.fritz.box ([193.159.26.95]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LfBX6-1bzKI93MlM-00olHb; Sat, 18 Feb 2017 23:31:33 +0100 Date: Sat, 18 Feb 2017 23:31:30 +0100 From: Helge Deller To: qemu-devel@nongnu.org, Riku Voipio Message-ID: <20170218223130.GA25278@ls3530.fritz.box> MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Mutt/1.7.1 (2016-10-04) X-Provags-ID: V03:K0:CjbDMJZ1PRX41lvhWuglzXMyEmVsHtb2zl5hbVj17tbLRuz32Pm 7M/SAMb8THSvx3tYUYCiC5klK7kVT0Mtpi9ilJYmbz+F4/bAOyZZs0ykyiEkENSXHCjo2ne pmDHi2wg8Sombf20qH8U6lAM/47DaC0DtedXPaBobAd0j4Hdpt7iiy8KbCNEi1SLud15gzb J7MJokUJatgyCWk0ldcGg== X-UI-Out-Filterresults: notjunk:1;V01:K0:grH8fqgxW+k=:7DPVg8I+Tx60+hxjnRCqwZ McUhqzcZ5cwjNKSdRcKgcxI03fhoSn0QP20Gy2iGcdy4aQAbuLVCRlHz7QFUZufJhFVPO8kRA wiuBHJ6GhSWa5c2iA5ZcnRiBUYJXcExgkR3DkABRqiFPZercKd/FVptRTUndyK7HzDjWINSET hkKhZPnQOgEX8yUMSBc1xUWa2rQb0Q6An78YKDDDvt2pcMSlJYL0a1uEBZ4u8nXhyCaPKnNs4 pCLcwkAmP3JDT5NPzGKOQaCUJv4j9DJP4zzUCy36f92KMvCdS73YtsONwe00ufqGLMc3X4K3E E9vaW5hr8WWtx95XkoULwW6uVDrh4Xh47RYxizOc0DfBvRQx4/YmoN6Y4CL7wqQD/xWlalLFk 39ooYSBuBGTBcTQCIRG97lpCNQRnhYM7CTF+vZLij3hON7RbU5DhGy1ZkHwtoip/lp6foLGe0 yGfkUJwdO7fEI6gFwCuIboxJCeHQ057Q9lOAWP/nhrLV9twPn814MSFI5l8LsAo7S5rAJakDT hz0913jNK6yPi3AkM+CRaOZCyiCrOHZPt89djJTJBoKR5p2calc3sHs/D4yKCT3qdcaOby4Nz cHHcsZlX4CYyQ0Q7SUjBAB6lHT3LAhtMe63tXbWWTvKUjlfnFg9Y5f3GZIFKxKhLa9nZr/ROm ymR8+qa7R/1HE4Vx2V8K4fnb0A6Rpw/yGiWijF2MCFDt3+bMs+O6tPcHItF33moD2t3cjehJl bKK31CQ/53ivKd6vAuUnF5c2YLzU1QepTQZej/3rMUDFfI6vBs5kCP+MBqw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.19 Subject: [Qemu-devel] [PATCH v5] linux-user: Add sockopts for IPv6 ping and IPv6 traceroute X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Philippe =?iso-8859-15?Q?Mathieu-Daud=E9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add the neccessary sockopts for ping and traceroute on IPv6. This fixes the following qemu warnings with IPv6: Unsupported ancillary data: 0/2 Unsupported ancillary data: 0/11 Unsupported ancillary data: 41/25 Unsupported setsockopt level=3D0 optname=3D12=20 Unsupported setsockopt level=3D41 optname=3D16 Unsupported setsockopt level=3D41 optname=3D25 Unsupported setsockopt level=3D41 optname=3D50 Unsupported setsockopt level=3D41 optname=3D51 Unsupported setsockopt level=3D41 optname=3D8 Unsupported setsockopt level=3D58 optname=3D1 Tested with hppa-linux-user (big-endian) on x86_64 (little-endian). Signed-off-by: Helge Deller Reviewed-by: Laurent Vivier Tested-by: Philippe Mathieu-Daud=C3=A9 --- Changes to v4: (all suggested by Laurent Vivier) - Handle AF_INET6 in host_to_target_sockaddr() - Drop length check for IP_TTL and SOL_IPV6 - Trunk optlen length in ICMPV6_FILTER if necessary Changes to v3: - Fix up checkpatch fallouts Changes to v2: (all suggested by Laurent Vivier) - Drop goto statements and replaced by real code - New function host_to_target_sockaddr_in6() - Fix IPV6_PKTINFO which uses in6_pktinfo instead of uint32_t - Move one IPV6_CHECKSUM from SOL_ICMPV6 to SOL_IPV6 - Fix ICMPV6_FILTER to use icmpv6_filter Changes to v1: - Added IPV6_PKTINFO sockopt as reported by Philippe Mathieu-Daud=C3=A9 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index f569f82..b9d10e7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -57,6 +57,8 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include #include #include +#include +#include #include "qemu-common.h" #ifdef CONFIG_TIMERFD #include @@ -1634,6 +1636,11 @@ static inline abi_long host_to_target_sockaddr(abi_u= long target_addr, struct sockaddr_ll *target_ll =3D (struct sockaddr_ll *)target_sad= dr; target_ll->sll_ifindex =3D tswap32(target_ll->sll_ifindex); target_ll->sll_hatype =3D tswap16(target_ll->sll_hatype); + } else if (addr->sa_family =3D=3D AF_INET6 && + len >=3D sizeof(struct target_sockaddr_in6)) { + struct target_sockaddr_in6 *target_in6 =3D + (struct target_sockaddr_in6 *)target_saddr; + target_in6->sin6_scope_id =3D tswap16(target_in6->sin6_scope_id); } unlock_user(target_saddr, target_addr, len); =20 @@ -1839,6 +1846,78 @@ static inline abi_long host_to_target_cmsg(struct ta= rget_msghdr *target_msgh, } break; =20 + case SOL_IP: + switch (cmsg->cmsg_type) { + case IP_TTL: + { + uint32_t *v =3D (uint32_t *)data; + uint32_t *t_int =3D (uint32_t *)target_data; + + __put_user(*v, t_int); + break; + } + case IP_RECVERR: + { + struct errhdr_t { + struct sock_extended_err ee; + struct sockaddr_in offender; + }; + struct errhdr_t *errh =3D (struct errhdr_t *)data; + struct errhdr_t *target_errh =3D + (struct errhdr_t *)target_data; + + __put_user(errh->ee.ee_errno, &target_errh->ee.ee_errno); + __put_user(errh->ee.ee_origin, &target_errh->ee.ee_origin); + __put_user(errh->ee.ee_type, &target_errh->ee.ee_type); + __put_user(errh->ee.ee_code, &target_errh->ee.ee_code); + __put_user(errh->ee.ee_pad, &target_errh->ee.ee_pad); + __put_user(errh->ee.ee_info, &target_errh->ee.ee_info); + __put_user(errh->ee.ee_data, &target_errh->ee.ee_data); + host_to_target_sockaddr((unsigned long) &target_errh->offe= nder, + (void *) &errh->offender, sizeof(errh->offender)); + break; + } + default: + goto unimplemented; + } + break; + + case SOL_IPV6: + switch (cmsg->cmsg_type) { + case IPV6_HOPLIMIT: + { + uint32_t *v =3D (uint32_t *)data; + uint32_t *t_int =3D (uint32_t *)target_data; + + __put_user(*v, t_int); + break; + } + case IPV6_RECVERR: + { + struct errhdr6_t { + struct sock_extended_err ee; + struct sockaddr_in6 offender; + }; + struct errhdr6_t *errh =3D (struct errhdr6_t *)data; + struct errhdr6_t *target_errh =3D + (struct errhdr6_t *)target_data; + + __put_user(errh->ee.ee_errno, &target_errh->ee.ee_errno); + __put_user(errh->ee.ee_origin, &target_errh->ee.ee_origin); + __put_user(errh->ee.ee_type, &target_errh->ee.ee_type); + __put_user(errh->ee.ee_code, &target_errh->ee.ee_code); + __put_user(errh->ee.ee_pad, &target_errh->ee.ee_pad); + __put_user(errh->ee.ee_info, &target_errh->ee.ee_info); + __put_user(errh->ee.ee_data, &target_errh->ee.ee_data); + host_to_target_sockaddr((unsigned long) &target_errh->offe= nder, + (void *) &errh->offender, sizeof(errh->offender)); + break; + } + default: + goto unimplemented; + } + break; + default: unimplemented: gemu_log("Unsupported ancillary data: %d/%d\n", @@ -2768,6 +2847,7 @@ static abi_long do_setsockopt(int sockfd, int level, = int optname, case IP_PKTINFO: case IP_MTU_DISCOVER: case IP_RECVERR: + case IP_RECVTTL: case IP_RECVTOS: #ifdef IP_FREEBIND case IP_FREEBIND: @@ -2817,6 +2897,11 @@ static abi_long do_setsockopt(int sockfd, int level,= int optname, case IPV6_MTU: case IPV6_V6ONLY: case IPV6_RECVPKTINFO: + case IPV6_UNICAST_HOPS: + case IPV6_RECVERR: + case IPV6_RECVHOPLIMIT: + case IPV6_2292HOPLIMIT: + case IPV6_CHECKSUM: val =3D 0; if (optlen < sizeof(uint32_t)) { return -TARGET_EINVAL; @@ -2827,6 +2912,50 @@ static abi_long do_setsockopt(int sockfd, int level,= int optname, ret =3D get_errno(setsockopt(sockfd, level, optname, &val, sizeof(val))); break; + case IPV6_PKTINFO: + { + struct in6_pktinfo pki; + + if (optlen < sizeof(pki)) { + return -TARGET_EINVAL; + } + + if (copy_from_user(&pki, optval_addr, sizeof(pki))) { + return -TARGET_EFAULT; + } + + pki.ipi6_ifindex =3D tswap32(pki.ipi6_ifindex); + + ret =3D get_errno(setsockopt(sockfd, level, optname, + &pki, sizeof(pki))); + break; + } + default: + goto unimplemented; + } + break; + case SOL_ICMPV6: + switch (optname) { + case ICMPV6_FILTER: + { + struct icmp6_filter icmp6f; + + if (optlen > sizeof(icmp6f)) { + optlen =3D sizeof(icmp6f); + } + + if (copy_from_user(&icmp6f, optval_addr, optlen)) { + return -TARGET_EFAULT; + } + + for (val =3D 0; val < 8; val++) { + icmp6f.data[val] =3D tswap32(icmp6f.data[val]); + } + + ret =3D get_errno(setsockopt(sockfd, level, optname, + &icmp6f, optlen)); + break; + } default: goto unimplemented; } @@ -2834,7 +2963,8 @@ static abi_long do_setsockopt(int sockfd, int level, = int optname, case SOL_RAW: switch (optname) { case ICMP_FILTER: - /* struct icmp_filter takes an u32 value */ + case IPV6_CHECKSUM: + /* those take an u32 value */ if (optlen < sizeof(uint32_t)) { return -TARGET_EINVAL; } diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 72ca5b1..40c5027 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -164,6 +164,14 @@ struct target_sockaddr_in { sizeof(struct target_in_addr)]; }; =20 +struct target_sockaddr_in6 { + uint16_t sin6_family; + uint16_t sin6_port; /* big endian */ + uint32_t sin6_flowinfo; /* big endian */ + struct in6_addr sin6_addr; /* IPv6 address, big endian */ + uint32_t sin6_scope_id; +}; + struct target_sock_filter { abi_ushort code; uint8_t jt;