Commit 2a92fccd authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

nexthop: Annotate struct nh_group 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_group.

Cc: David Ahern <dsahern@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org
Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

 [1]
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf9ecad9

include/net/nexthop.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ struct nh_group { 
	bool			has_v4;



	struct nh_res_table __rcu *res_table;

	struct nh_grp_entry	nh_entries[];

	struct nh_grp_entry	nh_entries[] __counted_by(num_nh);

};



struct nexthop {