From: Kees Cook Date: Fri, 22 Sep 2023 17:28:43 +0000 (-0700) Subject: ipv4: Annotate struct fib_info with __counted_by X-Git-Tag: v6.7-rc1~160^2~266^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b98fd5dc1e3b8446f98bc8c6e71d2585f9dcdce;p=thirdparty%2Fkernel%2Flinux.git ipv4: Annotate struct fib_info 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 fib_info. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: David Ahern Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Link: https://lore.kernel.org/r/20230922172858.3822653-1-keescook@chromium.org Signed-off-by: Jakub Kicinski --- diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index f0c13864180e2..84b0a82c9df42 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -156,7 +156,7 @@ struct fib_info { bool nh_updated; struct nexthop *nh; struct rcu_head rcu; - struct fib_nh fib_nh[]; + struct fib_nh fib_nh[] __counted_by(fib_nhs); };