netdev - Re: [PATCH v1 net-next 1/2] ipv6: Remove in6addr

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1d6392a2-ae42-ef7f-30b1-bd5d28b1a586@kernel.org>
Date:   Tue, 21 Mar 2023 20:22:53 -0600
From:   David Ahern <dsahern@...nel.org>
To:     Kuniyuki Iwashima <kuniyu@...zon.com>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>
Cc:     Kuniyuki Iwashima <kuni1840@...il.com>, netdev@...r.kernel.org
Subject: Re: [PATCH v1 net-next 1/2] ipv6: Remove in6addr_any alternatives.

On 3/21/23 7:22 PM, Kuniyuki Iwashima wrote:
> Some code defines the IPv6 wildcard address as a local variable.
> Let's use in6addr_any instead.
> 
> Signed-off-by: Kuniyuki Iwashima <kuniyu@...zon.com>
> ---
>  .../net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c |  5 ++---
>  include/net/ip6_fib.h                                 |  9 +++------
>  include/trace/events/fib.h                            |  5 ++---
>  include/trace/events/fib6.h                           |  5 +----
>  net/ethtool/ioctl.c                                   |  9 ++++-----
>  net/ipv4/inet_hashtables.c                            | 11 ++++-------
>  6 files changed, 16 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
> index a108e73c9f66..6a88f6b02678 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
> @@ -98,7 +98,6 @@ int mlx5e_tc_set_attr_rx_tun(struct mlx5e_tc_flow *flow,
>  #if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)
>  	else if (ip_version == 6) {
>  		int ipv6_size = MLX5_FLD_SZ_BYTES(ipv6_layout, ipv6);
> -		struct in6_addr zerov6 = {};
>  
>  		daddr = MLX5_ADDR_OF(fte_match_param, spec->match_value,
>  				     outer_headers.dst_ipv4_dst_ipv6.ipv6_layout.ipv6);
> @@ -106,8 +105,8 @@ int mlx5e_tc_set_attr_rx_tun(struct mlx5e_tc_flow *flow,
>  				     outer_headers.src_ipv4_src_ipv6.ipv6_layout.ipv6);
>  		memcpy(&tun_attr->dst_ip.v6, daddr, ipv6_size);
>  		memcpy(&tun_attr->src_ip.v6, saddr, ipv6_size);
> -		if (!memcmp(&tun_attr->dst_ip.v6, &zerov6, sizeof(zerov6)) ||
> -		    !memcmp(&tun_attr->src_ip.v6, &zerov6, sizeof(zerov6)))
> +		if (!memcmp(&tun_attr->dst_ip.v6, &in6addr_any, sizeof(in6addr_any)) ||
> +		    !memcmp(&tun_attr->src_ip.v6, &in6addr_any, sizeof(in6addr_any)))

I think ipv6_addr_any can be used here.

>  			return 0;
>  	}
>  #endif
>


> @@ -3233,20 +3232,20 @@ ethtool_rx_flow_rule_create(const struct ethtool_rx_flow_spec_input *input)
>  
>  		v6_spec = &fs->h_u.tcp_ip6_spec;
>  		v6_m_spec = &fs->m_u.tcp_ip6_spec;
> -		if (memcmp(v6_m_spec->ip6src, &zero_addr, sizeof(zero_addr))) {
> +		if (memcmp(v6_m_spec->ip6src, &in6addr_any, sizeof(in6addr_any))) {
>  			memcpy(&match->key.ipv6.src, v6_spec->ip6src,
>  			       sizeof(match->key.ipv6.src));
>  			memcpy(&match->mask.ipv6.src, v6_m_spec->ip6src,
>  			       sizeof(match->mask.ipv6.src));
>  		}
> -		if (memcmp(v6_m_spec->ip6dst, &zero_addr, sizeof(zero_addr))) {
> +		if (memcmp(v6_m_spec->ip6dst, &in6addr_any, sizeof(in6addr_any))) {
>  			memcpy(&match->key.ipv6.dst, v6_spec->ip6dst,
>  			       sizeof(match->key.ipv6.dst));
>  			memcpy(&match->mask.ipv6.dst, v6_m_spec->ip6dst,
>  			       sizeof(match->mask.ipv6.dst));
>  		}
> -		if (memcmp(v6_m_spec->ip6src, &zero_addr, sizeof(zero_addr)) ||
> -		    memcmp(v6_m_spec->ip6dst, &zero_addr, sizeof(zero_addr))) {
> +		if (memcmp(v6_m_spec->ip6src, &in6addr_any, sizeof(in6addr_any)) ||
> +		    memcmp(v6_m_spec->ip6dst, &in6addr_any, sizeof(in6addr_any))) {

and this group as well.

>  			match->dissector.used_keys |=
>  				BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS);
>  			match->dissector.offset[FLOW_DISSECTOR_KEY_IPV6_ADDRS] =
> diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
> index 6edae3886885..74caaa0c148b 100644
> --- a/net/ipv4/inet_hashtables.c
> +++ b/net/ipv4/inet_hashtables.c
> @@ -826,13 +826,11 @@ bool inet_bind2_bucket_match_addr_any(const struct inet_bind2_bucket *tb, const
>  				      unsigned short port, int l3mdev, const struct sock *sk)
>  {
>  #if IS_ENABLED(CONFIG_IPV6)
> -	struct in6_addr addr_any = {};
> -
>  	if (sk->sk_family != tb->family) {
>  		if (sk->sk_family == AF_INET)
>  			return net_eq(ib2_net(tb), net) && tb->port == port &&
>  				tb->l3mdev == l3mdev &&
> -				ipv6_addr_equal(&tb->v6_rcv_saddr, &addr_any);
> +				ipv6_addr_equal(&tb->v6_rcv_saddr, &in6addr_any);
>  
>  		return false;
>  	}
> @@ -840,7 +838,7 @@ bool inet_bind2_bucket_match_addr_any(const struct inet_bind2_bucket *tb, const
>  	if (sk->sk_family == AF_INET6)
>  		return net_eq(ib2_net(tb), net) && tb->port == port &&
>  			tb->l3mdev == l3mdev &&
> -			ipv6_addr_equal(&tb->v6_rcv_saddr, &addr_any);
> +			ipv6_addr_equal(&tb->v6_rcv_saddr, &in6addr_any);
>  	else
>  #endif
>  		return net_eq(ib2_net(tb), net) && tb->port == port &&

and these 2.