]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mlxsw: core: Annotate struct mlxsw_env with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 29 Sep 2023 18:07:41 +0000 (11:07 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 2 Oct 2023 18:27:12 +0000 (11:27 -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 mlxsw_env.

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

Cc: Petr Machata <petrm@nvidia.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://lore.kernel.org/r/20230929180746.3005922-2-keescook@chromium.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mellanox/mlxsw/core_env.c

index 7286f0deb5f9950c5bc88ffdd9260cd168c60502..53b150b7ae4e708080cf152c1260983f4cbfc54e 100644 (file)
@@ -34,7 +34,7 @@ struct mlxsw_env {
        u8 num_of_slots; /* Including the main board. */
        u8 max_eeprom_len; /* Maximum module EEPROM transaction length. */
        struct mutex line_cards_lock; /* Protects line cards. */
-       struct mlxsw_env_line_card *line_cards[];
+       struct mlxsw_env_line_card *line_cards[] __counted_by(num_of_slots);
 };
 
 static bool __mlxsw_env_linecard_is_active(struct mlxsw_env *mlxsw_env,