Skip to contentSkip to conversation

interconnect: icc-clk: Annotate struct icc_clk_provider with __counted_by

PATCH In review Kees Cook 2 participants 2 messages Aug 17, 2023 Interconnect API

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 interconnect: icc-clk: Annotate struct icc_clk_provider 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 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 icc_clk_provider.

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

Cc Georgi Djakov <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/interconnect/icc-clk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/interconnect/icc-clk.c +1 -1
index 4d43ebff4257..d787f2ea36d9 100644
@@ -16,7 +16,7 @@ struct icc_clk_node {
 struct icc_clk_provider {
 	struct icc_provider provider;
 	int num_clocks;
-	struct icc_clk_node clocks[];
+	struct icc_clk_node clocks[] __counted_by(num_clocks);
 };
 
 #define to_icc_clk_provider(_provider) \
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 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 checking via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).

Quoted 7 lines

As found with Coccinelle[1], add __counted_by for struct icc_clk_provider.

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

Cc Georgi Djakov <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
Reviewed-by Gustavo A. R. Silva <[email protected]>

Thanks
--
Gustavo

Quoted 17 lines
---
  drivers/interconnect/icc-clk.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/interconnect/icc-clk.c +1 -1
index 4d43ebff4257..d787f2ea36d9 100644
@@ -16,7 +16,7 @@ struct icc_clk_node {
  struct icc_clk_provider {
  	struct icc_provider provider;
  	int num_clocks;
-	struct icc_clk_node clocks[];
+	struct icc_clk_node clocks[] __counted_by(num_clocks);
  };
 
  #define to_icc_clk_provider(_provider) \