From: Kees Cook Date: Tue, 3 Oct 2023 23:18:13 +0000 (-0700) Subject: nexthop: Annotate struct nh_res_table with __counted_by X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2253bb3ff242af3b1a53cb98e2e4eb1eec82dd2a;p=linux.git nexthop: Annotate struct nh_res_table 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 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 nh_res_table. Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1] Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Reviewed-by: David Ahern Link: https://lore.kernel.org/r/20231003231813.work.042-kees@kernel.org Signed-off-by: Jakub Kicinski --- diff --git a/include/net/nexthop.h b/include/net/nexthop.h index 2b12725de9c09..0b1172dbb334e 100644 --- a/include/net/nexthop.h +++ b/include/net/nexthop.h @@ -92,7 +92,7 @@ struct nh_res_table { u32 unbalanced_timer; u16 num_nh_buckets; - struct nh_res_bucket nh_buckets[]; + struct nh_res_bucket nh_buckets[] __counted_by(num_nh_buckets); }; struct nh_grp_entry {