nfp: Annotate struct nfp_reprs with __counted_by
authorKees Cook <keescook@chromium.org>
Tue, 3 Oct 2023 23:18:43 +0000 (16:18 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 6 Oct 2023 01:32:10 +0000 (18:32 -0700)
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 nfp_reprs.

Cc: Simon Horman <simon.horman@corigine.com>
Cc: oss-drivers@corigine.com
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>
Acked-by: Louis Peens <louis.peens@corigine.com>
Link: https://lore.kernel.org/r/20231003231843.work.811-kees@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/netronome/nfp/nfp_net_repr.h

index 48a74accbbd378fc252ed946ffed81be1d02da5f..77bf4198dbde7be5ae64b4064a30f5b4de6f58bd 100644 (file)
@@ -18,7 +18,7 @@ struct nfp_port;
  */
 struct nfp_reprs {
        unsigned int num_reprs;
-       struct net_device __rcu *reprs[];
+       struct net_device __rcu *reprs[] __counted_by(num_reprs);
 };
 
 /**