Skip to contentSkip to conversation

nfp: nsp: Annotate struct nfp_eth_table with __counted_by

PATCH Applied Kees Cook 4 participants 4 messages Oct 3, 2023 – Oct 6, 2023

Subsystems (3)
Networking Network drivers Netronome Ethernet drivers
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 nfp: nsp: Annotate struct nfp_eth_table 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 nfp_eth_table.

Cc Simon Horman <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Yinjun Zhang <[email protected]>
Cc Leon Romanovsky <[email protected]>
Cc Yu Xiao <[email protected]>
Cc Sixiang Chen <[email protected]>
Cc [email protected]
Cc [email protected]
Link https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h +1 -1
index 6e044ac04917..00264af13b49 100644
@@ -241,7 +241,7 @@ struct nfp_eth_table {
 
 		u64 link_modes_supp[2];
 		u64 link_modes_ad[2];
-	} ports[];
+	} ports[] __counted_by(count);
 };
 
 struct nfp_eth_table *nfp_eth_read_ports(struct nfp_cpp *cpp);
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 nfp_eth_table.

Quoted 13 lines
Cc Simon Horman <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Yinjun Zhang <[email protected]>
Cc Leon Romanovsky <[email protected]>
Cc Yu Xiao <[email protected]>
Cc Sixiang Chen <[email protected]>
Cc [email protected]
Cc [email protected]
Link https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by Kees Cook <[email protected]>
Reviewed-by Gustavo A. R. Silva <[email protected]>

Thanks
--
Gustavo

Quoted 17 lines
---
  drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h +1 -1
index 6e044ac04917..00264af13b49 100644
@@ -241,7 +241,7 @@ struct nfp_eth_table {
 
  		u64 link_modes_supp[2];
  		u64 link_modes_ad[2];
-	} ports[];
+	} ports[] __counted_by(count);
  };
 
  struct nfp_eth_table *nfp_eth_read_ports(struct nfp_cpp *cpp);
Acked-by on v1 1/1
#2 lore raw
In reply to Kees Cook
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 nfp_eth_table.

Quoted 13 lines
Cc Simon Horman <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Yinjun Zhang <[email protected]>
Cc Leon Romanovsky <[email protected]>
Cc Yu Xiao <[email protected]>
Cc Sixiang Chen <[email protected]>
Cc [email protected]
Cc [email protected]
Link https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by Kees Cook <[email protected]>

Likewise here, thanks for updating

Acked-by Louis Peens <[email protected]>
Quoted 20 lines
---
 drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h +1 -1
index 6e044ac04917..00264af13b49 100644
@@ -241,7 +241,7 @@ struct nfp_eth_table {
 
 		u64 link_modes_supp[2];
 		u64 link_modes_ad[2];
-	} ports[];
+	} ports[] __counted_by(count);
 };
 
 struct nfp_eth_table *nfp_eth_read_ports(struct nfp_cpp *cpp);
Signature · 1 line
2.34.1
CI Applied
#3 lore raw
In reply to Kees Cook
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:

Quoted 9 lines · On Tue, 3 Oct 2023 16:18:51 -0700 you wrote:

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 nfp_eth_table.

[...]

Here is the summary with links:
- nfp: nsp: Annotate struct nfp_eth_table with __counted_by

    https://git.kernel.org/netdev/net-next/c/178e9bf9b57d

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html