]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: enetc: Annotate struct enetc_int_vector with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:28:47 +0000 (10:28 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 2 Oct 2023 18:24:53 +0000 (11:24 -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 enetc_int_vector.

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

Cc: Claudiu Manoil <claudiu.manoil@nxp.com>
Cc: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230922172858.3822653-5-keescook@chromium.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/freescale/enetc/enetc.h

index 7439739cd81a231bc42d162f4777c1f490de41de..a9c2ff22431c578949b8de4ed4964e4c308bd370 100644 (file)
@@ -297,7 +297,7 @@ struct enetc_int_vector {
        char name[ENETC_INT_NAME_MAX];
 
        struct enetc_bdr rx_ring;
-       struct enetc_bdr tx_ring[];
+       struct enetc_bdr tx_ring[] __counted_by(count_tx_rings);
 } ____cacheline_aligned_in_smp;
 
 struct enetc_cls_rule {