Skip to contentSkip to conversation

bus: vexpress-config: Annotate struct vexpress_syscfg_func with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Sep 22, 2023 – Sep 27, 2023 Arm/versatile express platform

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 bus: vexpress-config: Annotate struct vexpress_syscfg_func 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 vexpress_syscfg_func.

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

Cc Liviu Dudau <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Rob Herring <[email protected]>
Cc Yangtao Li <[email protected]>
---
 drivers/bus/vexpress-config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/vexpress-config.c +1 -1
index c4e1becbb2d2..d2c7ada90186 100644
@@ -54,7 +54,7 @@ struct vexpress_syscfg_func {
 	struct vexpress_syscfg *syscfg;
 	struct regmap *regmap;
 	int num_templates;
-	u32 template[]; /* Keep it last! */
+	u32 template[] __counted_by(num_templates); /* Keep it last! */
 };
 
 struct vexpress_config_bridge_ops {
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 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).

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

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

Quoted 7 lines
Cc Liviu Dudau <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Rob Herring <[email protected]>
Cc Yangtao Li <[email protected]>

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/bus/vexpress-config.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/vexpress-config.c +1 -1
index c4e1becbb2d2..d2c7ada90186 100644
@@ -54,7 +54,7 @@ struct vexpress_syscfg_func {
  	struct vexpress_syscfg *syscfg;
  	struct regmap *regmap;
  	int num_templates;
-	u32 template[]; /* Keep it last! */
+	u32 template[] __counted_by(num_templates); /* Keep it last! */
  };
 
  struct vexpress_config_bridge_ops {
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 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 vexpress_syscfg_func.

[...]

Applied to sudeep.holla/linux (for-next/vexpress/updates), thanks!

[1/1] bus: vexpress-config: Annotate struct vexpress_syscfg_func with __counted_by

      https://git.kernel.org/sudeep.holla/c/cb289ce6e2ce

--
Regards,
Sudeep