netdev - Re: [PATCH 02/14] ipv4/igmp: Annotate struct ip_sf_socklist with __counted

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: <3bc23613-d1d0-5a05-3057-86933b2c844a@embeddedor.com>
Date: Fri, 22 Sep 2023 19:50:39 -0600
From: "Gustavo A. R. Silva" <gustavo@...eddedor.com>
To: Kees Cook <keescook@...omium.org>, Jakub Kicinski <kuba@...nel.org>
Cc: "David S. Miller" <davem@...emloft.net>,
 Martin KaFai Lau <martin.lau@...nel.org>,
 "Gustavo A. R. Silva" <gustavoars@...nel.org>,
 Eric Dumazet <edumazet@...gle.com>, Alexei Starovoitov <ast@...nel.org>,
 Jamal Hadi Salim <jhs@...atatu.com>, David Ahern <dsahern@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, Yisen Zhuang <yisen.zhuang@...wei.com>,
 Salil Mehta <salil.mehta@...wei.com>, Claudiu Manoil
 <claudiu.manoil@....com>, Vladimir Oltean <vladimir.oltean@....com>,
 "K. Y. Srinivasan" <kys@...rosoft.com>,
 Haiyang Zhang <haiyangz@...rosoft.com>, Wei Liu <wei.liu@...nel.org>,
 Dexuan Cui <decui@...rosoft.com>, Long Li <longli@...rosoft.com>,
 Ajay Sharma <sharmaajay@...rosoft.com>, Alex Elder <elder@...nel.org>,
 Pravin B Shelar <pshelar@....org>, Shaokun Zhang
 <zhangshaokun@...ilicon.com>, Cong Wang <xiyou.wangcong@...il.com>,
 Jiri Pirko <jiri@...nulli.us>, Nathan Chancellor <nathan@...nel.org>,
 Nick Desaulniers <ndesaulniers@...gle.com>, Tom Rix <trix@...hat.com>,
 Simon Horman <horms@...nel.org>, linux-kernel@...r.kernel.org,
 netdev@...r.kernel.org, linux-hyperv@...r.kernel.org,
 linux-rdma@...r.kernel.org, dev@...nvswitch.org,
 linux-parisc@...r.kernel.org, llvm@...ts.linux.dev,
 linux-hardening@...r.kernel.org
Subject: Re: [PATCH 02/14] ipv4/igmp: Annotate struct ip_sf_socklist with
 __counted_by

On 9/22/23 11:28, Kees Cook wrote:
> Prepare for the coming implementation by GCC and Clang of the __counted_by
> attribute. Flexible array members annotated with __counted_by can have
> their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS
> (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
> functions).
> 
> As found with Coccinelle[1], add __counted_by for struct ip_sf_socklist.
> 
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
> 
> Cc: "David S. Miller" <davem@...emloft.net>
> Cc: Martin KaFai Lau <martin.lau@...nel.org>
> Cc: "Gustavo A. R. Silva" <gustavoars@...nel.org>
> Cc: Eric Dumazet <edumazet@...gle.com>
> Cc: Alexei Starovoitov <ast@...nel.org>
> Cc: Jakub Kicinski <kuba@...nel.org>
> Signed-off-by: Kees Cook <keescook@...omium.org>

Reviewed-by: Gustavo A. R. Silva <gustavoars@...nel.org>

Thanks
-- 
Gustavo

> ---
>   include/linux/igmp.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/igmp.h b/include/linux/igmp.h
> index ebf4349a53af..5171231f70a8 100644
> --- a/include/linux/igmp.h
> +++ b/include/linux/igmp.h
> @@ -39,7 +39,7 @@ struct ip_sf_socklist {
>   	unsigned int		sl_max;
>   	unsigned int		sl_count;
>   	struct rcu_head		rcu;
> -	__be32			sl_addr[];
> +	__be32			sl_addr[] __counted_by(sl_max);
>   };
>   
>   #define IP_SFBLOCK	10	/* allocate this many at once */