From: Kees Cook Date: Fri, 22 Sep 2023 17:28:44 +0000 (-0700) Subject: ipv4/igmp: Annotate struct ip_sf_socklist with __counted_by X-Git-Tag: v6.7-rc1~160^2~266^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=210d4e9c732fa87b584af72faae96c037d9d7957;p=thirdparty%2Flinux.git ipv4/igmp: Annotate struct ip_sf_socklist with __counted_by 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: Martin KaFai Lau Cc: Alexei Starovoitov Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Link: https://lore.kernel.org/r/20230922172858.3822653-2-keescook@chromium.org Signed-off-by: Jakub Kicinski --- diff --git a/include/linux/igmp.h b/include/linux/igmp.h index ebf4349a53af7..5171231f70a8b 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 */