bus: vexpress-config: Annotate struct vexpress_syscfg_func with __counted_by
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
--- drivers/bus/vexpress-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/vexpress-config.c +1 -1
@@ -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
Quoted 10 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structvexpress_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]>Signed-off-by Kees Cook <[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@@ -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 {
Sudeep Holla
AppliedQuoted 9 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structvexpress_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