cxgb4: Annotate struct smt_data with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 29 Sep 2023 18:11:49 +0000 (11:11 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 4 Oct 2023 22:37:13 +0000 (15:37 -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 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 smt_data.

[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

Cc: Raju Rangoju <rajur@chelsio.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230929181149.3006432-5-keescook@chromium.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/chelsio/cxgb4/smt.h

index 541249d7891430d70a38ed0e8701e8fffebec356..109c1dff563a3d55a5a029e12e0690a43fa20c78 100644 (file)
@@ -66,7 +66,7 @@ struct smt_entry {
 struct smt_data {
        unsigned int smt_size;
        rwlock_t lock;
-       struct smt_entry smtab[];
+       struct smt_entry smtab[] __counted_by(smt_size);
 };
 
 struct smt_data *t4_init_smt(void);