Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <184f66e5839a765571547f490988f25c5290856b.camel@redhat.com>
Subject: Re: [PATCH] net: ipv4: Avoid bounds check warning
From:   Paolo Abeni <pabeni@redhat.com>
To:     Genjian Zhang <zhanggenjian123@gmail.com>, edumazet@google.com,
        davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org,
        kuba@kernel.org
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        huhai@kylinos.cn
Date:   Thu, 26 May 2022 10:22:25 +0200
In-Reply-To: <20220524072326.3484768-1-zhanggenjian@kylinos.cn>
References: <20220524072326.3484768-1-zhanggenjian@kylinos.cn>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.42.4 (3.42.4-2.fc35) 
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

On Tue, 2022-05-24 at 15:23 +0800, Genjian Zhang wrote:
> From: huhai <huhai@kylinos.cn>
> 
> Fix the following build warning when CONFIG_IPV6 is not set:
> 
> In function ‘fortify_memcpy_chk’,
>     inlined from ‘tcp_md5_do_add’ at net/ipv4/tcp_ipv4.c:1211:2:
> ./include/linux/fortify-string.h:328:4: error: call to ‘__write_overflow_field’ declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
>   328 |    __write_overflow_field(p_size_field, size);
>       |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Signed-off-by: huhai <huhai@kylinos.cn>
> ---
>  net/ipv4/tcp_ipv4.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> index 457f5b5d5d4a..ed03b8c48443 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -1207,9 +1207,14 @@ int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,
>  	key->prefixlen = prefixlen;
>  	key->l3index = l3index;
>  	key->flags = flags;
> +#if IS_ENABLED(CONFIG_IPV6)
>  	memcpy(&key->addr, addr,
>  	       (family == AF_INET6) ? sizeof(struct in6_addr) :
>  				      sizeof(struct in_addr));

I'm wondering if you could avoid the extra compiler conditional with
something alike:

 	memcpy(&key->addr, addr,
  	       (IS_ENABLED(CONFIG_IPV6) && family == AF_INET6) ? sizeof(struct in6_addr) :
								 sizeof(struct in_addr));

Thanks!

Paolo