From: David Ahern <dsahern@kernel.org>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, schoen@loyalty.org,
David Ahern <dsahern@gmail.com>
Subject: [PATCH net-next v3 03/13] selftests: Move address validation in nettest
Date: Tue, 12 Jan 2021 21:00:30 -0700 [thread overview]
Message-ID: <20210113040040.50813-4-dsahern@kernel.org> (raw)
In-Reply-To: <20210113040040.50813-1-dsahern@kernel.org>
From: David Ahern <dsahern@gmail.com>
IPv6 addresses can have a device name to declare a scope (e.g.,
fe80::5054:ff:fe12:3456%eth0). The next patch adds support to
switch network namespace before running client or server code
(or both), so move the address validation to the server and
client functions.
IPv4 multicast groups do not have the device scope in the address
specification, so they can be validated inline with option parsing.
Signed-off-by: David Ahern <dsahern@gmail.com>
---
tools/testing/selftests/net/nettest.c | 60 +++++++++++++++++++--------
1 file changed, 43 insertions(+), 17 deletions(-)
diff --git a/tools/testing/selftests/net/nettest.c b/tools/testing/selftests/net/nettest.c
index 337ae54e252d..3b083fad3577 100644
--- a/tools/testing/selftests/net/nettest.c
+++ b/tools/testing/selftests/net/nettest.c
@@ -43,12 +43,14 @@
struct sock_args {
/* local address */
+ const char *local_addr_str;
union {
struct in_addr in;
struct in6_addr in6;
} local_addr;
/* remote address */
+ const char *remote_addr_str;
union {
struct in_addr in;
struct in6_addr in6;
@@ -77,6 +79,7 @@ struct sock_args {
const char *password;
/* prefix for MD5 password */
+ const char *md5_prefix_str;
union {
struct sockaddr_in v4;
struct sockaddr_in6 v6;
@@ -88,12 +91,14 @@ struct sock_args {
int expected_ifindex;
/* local address */
+ const char *expected_laddr_str;
union {
struct in_addr in;
struct in6_addr in6;
} expected_laddr;
/* remote address */
+ const char *expected_raddr_str;
union {
struct in_addr in;
struct in6_addr in6;
@@ -753,6 +758,34 @@ static int convert_addr(struct sock_args *args, const char *_str,
return rc;
}
+static int validate_addresses(struct sock_args *args)
+{
+ if (args->local_addr_str &&
+ convert_addr(args, args->local_addr_str, ADDR_TYPE_LOCAL) < 0)
+ return 1;
+
+ if (args->remote_addr_str &&
+ convert_addr(args, args->remote_addr_str, ADDR_TYPE_REMOTE) < 0)
+ return 1;
+
+ if (args->md5_prefix_str &&
+ convert_addr(args, args->md5_prefix_str,
+ ADDR_TYPE_MD5_PREFIX) < 0)
+ return 1;
+
+ if (args->expected_laddr_str &&
+ convert_addr(args, args->expected_laddr_str,
+ ADDR_TYPE_EXPECTED_LOCAL))
+ return 1;
+
+ if (args->expected_raddr_str &&
+ convert_addr(args, args->expected_raddr_str,
+ ADDR_TYPE_EXPECTED_REMOTE))
+ return 1;
+
+ return 0;
+}
+
static int get_index_from_cmsg(struct msghdr *m)
{
struct cmsghdr *cm;
@@ -1344,7 +1377,7 @@ static int do_server(struct sock_args *args)
fd_set rfds;
int rc;
- if (resolve_devices(args))
+ if (resolve_devices(args) || validate_addresses(args))
return 1;
if (prog_timeout)
@@ -1532,7 +1565,7 @@ static int do_client(struct sock_args *args)
return 1;
}
- if (resolve_devices(args))
+ if (resolve_devices(args) || validate_addresses(args))
return 1;
if ((args->use_setsockopt || args->use_cmsg) && !args->ifindex) {
@@ -1680,13 +1713,11 @@ int main(int argc, char *argv[])
break;
case 'l':
args.has_local_ip = 1;
- if (convert_addr(&args, optarg, ADDR_TYPE_LOCAL) < 0)
- return 1;
+ args.local_addr_str = optarg;
break;
case 'r':
args.has_remote_ip = 1;
- if (convert_addr(&args, optarg, ADDR_TYPE_REMOTE) < 0)
- return 1;
+ args.remote_addr_str = optarg;
break;
case 'p':
if (str_to_uint(optarg, 1, 65535, &tmp) != 0) {
@@ -1733,8 +1764,7 @@ int main(int argc, char *argv[])
args.password = optarg;
break;
case 'm':
- if (convert_addr(&args, optarg, ADDR_TYPE_MD5_PREFIX) < 0)
- return 1;
+ args.md5_prefix_str = optarg;
break;
case 'S':
args.use_setsockopt = 1;
@@ -1762,16 +1792,11 @@ int main(int argc, char *argv[])
break;
case '0':
args.has_expected_laddr = 1;
- if (convert_addr(&args, optarg,
- ADDR_TYPE_EXPECTED_LOCAL))
- return 1;
+ args.expected_laddr_str = optarg;
break;
case '1':
args.has_expected_raddr = 1;
- if (convert_addr(&args, optarg,
- ADDR_TYPE_EXPECTED_REMOTE))
- return 1;
-
+ args.expected_raddr_str = optarg;
break;
case '2':
args.expected_dev = optarg;
@@ -1786,12 +1811,13 @@ int main(int argc, char *argv[])
}
if (args.password &&
- ((!args.has_remote_ip && !args.prefix_len) || args.type != SOCK_STREAM)) {
+ ((!args.has_remote_ip && !args.md5_prefix_str) ||
+ args.type != SOCK_STREAM)) {
log_error("MD5 passwords apply to TCP only and require a remote ip for the password\n");
return 1;
}
- if (args.prefix_len && !args.password) {
+ if (args.md5_prefix_str && !args.password) {
log_error("Prefix range for MD5 protection specified without a password\n");
return 1;
}
--
2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-01-13 4:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 4:00 [PATCH net-next v3 00/13] selftests: Updates to allow single instance of nettest for client and server David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 01/13] selftests: Move device validation in nettest David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 02/13] selftests: Move convert_addr up " David Ahern
2021-01-13 4:00 ` David Ahern [this message]
2021-01-13 4:00 ` [PATCH net-next v3 04/13] selftests: Add options to set network namespace to nettest David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 05/13] selftests: Add support to nettest to run both client and server David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 06/13] selftests: Use separate stdout and stderr buffers in nettest David Ahern
2021-01-13 23:56 ` Jakub Kicinski
2021-01-14 0:08 ` David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 07/13] selftests: Add missing newline in nettest error messages David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 08/13] selftests: Make address validation apply only to client mode David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 09/13] selftests: Consistently specify address for MD5 protection David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 10/13] selftests: Add new option for client-side passwords David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 11/13] selftests: Add separate options for server device bindings David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 12/13] selftests: Remove exraneous newline in nettest David Ahern
2021-01-13 4:00 ` [PATCH net-next v3 13/13] selftests: Add separate option to nettest for address binding David Ahern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210113040040.50813-4-dsahern@kernel.org \
--to=dsahern@kernel.org \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=schoen@loyalty.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).