Skip to contentSkip to conversation

interconnect: Annotate struct icc_path 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: Annotate struct icc_path 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_path.

[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/internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/interconnect/internal.h +1 -1
index f5f82a5c939e..b30856db523d 100644
@@ -38,7 +38,7 @@ struct icc_req {
 struct icc_path {
 	const char *name;
 	size_t num_nodes;
-	struct icc_req reqs[];
+	struct icc_req reqs[] __counted_by(num_nodes);
 };
 
 #endif
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_path.

[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/internal.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/interconnect/internal.h +1 -1
index f5f82a5c939e..b30856db523d 100644
@@ -38,7 +38,7 @@ struct icc_req {
  struct icc_path {
  	const char *name;
  	size_t num_nodes;
-	struct icc_req reqs[];
+	struct icc_req reqs[] __counted_by(num_nodes);
  };
 
  #endif