From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-co1nam03on0122.outbound.protection.outlook.com ([104.47.40.122]:59200 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933301AbeCSPrj (ORCPT ); Mon, 19 Mar 2018 11:47:39 -0400 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Sowmini Varadhan , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.15 029/124] selftests/net: fix bugs in address and port initialization Date: Mon, 19 Mar 2018 15:47:28 +0000 Message-ID: <20180319154645.11350-29-alexander.levin@microsoft.com> References: <20180319154645.11350-1-alexander.levin@microsoft.com> In-Reply-To: <20180319154645.11350-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Sowmini Varadhan [ Upstream commit d36f45e5b46723cf2d4147173e18c52d4143176d ] Address/port initialization should work correctly regardless of the order in which command line arguments are supplied, E.g, cfg_port should be used to connect to the remote host even if it is processed after -D, src/dst address initialization should not require that [-4|-6] be specified before the -S or -D args, receiver should be able to bind to *. Achieve this by making sure that the address/port structures are initialized after all command line options are parsed. Store cfg_port in host-byte order, and use htons() to set up the sin_port/sin6_port before bind/connect, so that the network system calls get the correct values in network-byte order. Signed-off-by: Sowmini Varadhan Acked-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- tools/testing/selftests/net/msg_zerocopy.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/msg_zerocopy.c b/tools/testing/sel= ftests/net/msg_zerocopy.c index 3ab6ec403905..e11fe84de0fd 100644 --- a/tools/testing/selftests/net/msg_zerocopy.c +++ b/tools/testing/selftests/net/msg_zerocopy.c @@ -259,22 +259,28 @@ static int setup_ip6h(struct ipv6hdr *ip6h, uint16_t = payload_len) return sizeof(*ip6h); } =20 -static void setup_sockaddr(int domain, const char *str_addr, void *sockadd= r) + +static void setup_sockaddr(int domain, const char *str_addr, + struct sockaddr_storage *sockaddr) { struct sockaddr_in6 *addr6 =3D (void *) sockaddr; struct sockaddr_in *addr4 =3D (void *) sockaddr; =20 switch (domain) { case PF_INET: + memset(addr4, 0, sizeof(*addr4)); addr4->sin_family =3D AF_INET; addr4->sin_port =3D htons(cfg_port); - if (inet_pton(AF_INET, str_addr, &(addr4->sin_addr)) !=3D 1) + if (str_addr && + inet_pton(AF_INET, str_addr, &(addr4->sin_addr)) !=3D 1) error(1, 0, "ipv4 parse error: %s", str_addr); break; case PF_INET6: + memset(addr6, 0, sizeof(*addr6)); addr6->sin6_family =3D AF_INET6; addr6->sin6_port =3D htons(cfg_port); - if (inet_pton(AF_INET6, str_addr, &(addr6->sin6_addr)) !=3D 1) + if (str_addr && + inet_pton(AF_INET6, str_addr, &(addr6->sin6_addr)) !=3D 1) error(1, 0, "ipv6 parse error: %s", str_addr); break; default: @@ -603,6 +609,7 @@ static void parse_opts(int argc, char **argv) sizeof(struct tcphdr) - 40 /* max tcp options */; int c; + char *daddr =3D NULL, *saddr =3D NULL; =20 cfg_payload_len =3D max_payload_len; =20 @@ -627,7 +634,7 @@ static void parse_opts(int argc, char **argv) cfg_cpu =3D strtol(optarg, NULL, 0); break; case 'D': - setup_sockaddr(cfg_family, optarg, &cfg_dst_addr); + daddr =3D optarg; break; case 'i': cfg_ifindex =3D if_nametoindex(optarg); @@ -638,7 +645,7 @@ static void parse_opts(int argc, char **argv) cfg_cork_mixed =3D true; break; case 'p': - cfg_port =3D htons(strtoul(optarg, NULL, 0)); + cfg_port =3D strtoul(optarg, NULL, 0); break; case 'r': cfg_rx =3D true; @@ -647,7 +654,7 @@ static void parse_opts(int argc, char **argv) cfg_payload_len =3D strtoul(optarg, NULL, 0); break; case 'S': - setup_sockaddr(cfg_family, optarg, &cfg_src_addr); + saddr =3D optarg; break; case 't': cfg_runtime_ms =3D 200 + strtoul(optarg, NULL, 10) * 1000; @@ -660,6 +667,8 @@ static void parse_opts(int argc, char **argv) break; } } + setup_sockaddr(cfg_family, daddr, &cfg_dst_addr); + setup_sockaddr(cfg_family, saddr, &cfg_src_addr); =20 if (cfg_payload_len > max_payload_len) error(1, 0, "-s: payload exceeds max (%d)", max_payload_len); --=20 2.14.1