i40e: Annotate struct i40e_qvlist_info with __counted_by
authorKees Cook <keescook@chromium.org>
Tue, 3 Oct 2023 23:18:38 +0000 (16:18 -0700)
committerKees Cook <keescook@chromium.org>
Thu, 30 Nov 2023 21:39:20 +0000 (13:39 -0800)
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 i40e_qvlist_info.

Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: Shiraz Saleem <shiraz.saleem@intel.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Gurucharan G <gurucharanx.g@intel.com>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20231003231838.work.510-kees@kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
include/linux/net/intel/i40e_client.h

index ed42bd5f639f2a30d457c12f46e458107532a418..0aa4411528fc5ecd23f1fcd2638806d2609a9e2a 100644 (file)
@@ -45,7 +45,7 @@ struct i40e_qv_info {
 
 struct i40e_qvlist_info {
        u32 num_vectors;
-       struct i40e_qv_info qv_info[];
+       struct i40e_qv_info qv_info[] __counted_by(num_vectors);
 };