wifi: ipw2x00: Annotate struct libipw_txb with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 15 Sep 2023 20:06:02 +0000 (13:06 -0700)
committerKalle Valo <kvalo@kernel.org>
Thu, 21 Sep 2023 06:30:43 +0000 (09:30 +0300)
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 libipw_txb.

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

Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: linux-wireless@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230915200602.never.582-kees@kernel.org
drivers/net/wireless/intel/ipw2x00/libipw.h

index bec7bc2..9065ca5 100644 (file)
@@ -488,7 +488,7 @@ struct libipw_txb {
        u8 reserved;
        u16 frag_size;
        u16 payload_size;
-       struct sk_buff *fragments[];
+       struct sk_buff *fragments[] __counted_by(nr_frags);
 };
 
 /* SWEEP TABLE ENTRIES NUMBER */