netlink: Annotate struct netlink_policy_dump_state with __counted_by
authorKees Cook <keescook@chromium.org>
Tue, 3 Oct 2023 23:21:02 +0000 (16:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Oct 2023 09:48:46 +0000 (10:48 +0100)
commiteaede99c3aeb38613c40a150f676f772faf2b42b
treea763b88a594c39bdb8e8e29dde74f59fed8c4182
parent178e9bf9b57d7671e94d39848a8ed090fe9ee431
netlink: Annotate struct netlink_policy_dump_state 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 netlink_policy_dump_state.

Additionally update the size of the usage array length before accessing
it. This requires remembering the old size for the memset() and later
assignments.

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: Johannes Berg <johannes.berg@intel.com>
Cc: netdev@vger.kernel.org
Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netlink/policy.c