Skip to contentSkip to conversation

i40e: Annotate struct i40e_qvlist_info with __counted_by

PATCH Applied Kees Cook 2 participants 3 messages Oct 3, 2023 – Nov 30, 2023 Intel Ethernet

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 i40e: Annotate struct i40e_qvlist_info with __counted_by

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.

---
 include/linux/net/intel/i40e_client.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/net/intel/i40e_client.h +1 -1
index ed42bd5f639f..0aa4411528fc 100644
@@ -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);
 };
 
 
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Kees Cook

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.

Quoted 8 lines

Thanks
--
Gustavo

Quoted 17 lines
---
  include/linux/net/intel/i40e_client.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/net/intel/i40e_client.h +1 -1
index ed42bd5f639f..0aa4411528fc 100644
@@ -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);
  };
 
 
author Applied
#2 lore raw
In reply to Kees Cook
Quoted 9 lines · Kees Cook

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.

[...]

Applied to for-next/hardening, thanks!

[1/1] i40e: Annotate struct i40e_qvlist_info with __counted_by

      https://git.kernel.org/kees/c/da2e08d4630a

Take care,

Signature · 1 line
Kees Cook