* [PATCH] bus: vexpress-config: Annotate struct vexpress_syscfg_func with __counted_by
@ 2023-09-22 17:52 Kees Cook
2023-09-23 16:35 ` Gustavo A. R. Silva
2023-09-27 13:09 ` Sudeep Holla
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:52 UTC (permalink / raw)
To: Liviu Dudau
Cc: Kees Cook, Sudeep Holla, Lorenzo Pieralisi, Rob Herring,
Yangtao Li, linux-arm-kernel, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
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 <liviu.dudau@arm.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Yangtao Li <frank.li@vivo.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/bus/vexpress-config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c
index c4e1becbb2d2..d2c7ada90186 100644
--- a/drivers/bus/vexpress-config.c
+++ b/drivers/bus/vexpress-config.c
@@ -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 {
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] bus: vexpress-config: Annotate struct vexpress_syscfg_func with __counted_by
2023-09-22 17:52 [PATCH] bus: vexpress-config: Annotate struct vexpress_syscfg_func with __counted_by Kees Cook
@ 2023-09-23 16:35 ` Gustavo A. R. Silva
2023-09-27 13:09 ` Sudeep Holla
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:35 UTC (permalink / raw)
To: Kees Cook, Liviu Dudau
Cc: Sudeep Holla, Lorenzo Pieralisi, Rob Herring, Yangtao Li,
linux-arm-kernel, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On 9/22/23 11:52, Kees Cook 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 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 <liviu.dudau@arm.com>
> Cc: Sudeep Holla <sudeep.holla@arm.com>
> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Yangtao Li <frank.li@vivo.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/bus/vexpress-config.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c
> index c4e1becbb2d2..d2c7ada90186 100644
> --- a/drivers/bus/vexpress-config.c
> +++ b/drivers/bus/vexpress-config.c
> @@ -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 {
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] bus: vexpress-config: Annotate struct vexpress_syscfg_func with __counted_by
2023-09-22 17:52 [PATCH] bus: vexpress-config: Annotate struct vexpress_syscfg_func with __counted_by Kees Cook
2023-09-23 16:35 ` Gustavo A. R. Silva
@ 2023-09-27 13:09 ` Sudeep Holla
1 sibling, 0 replies; 3+ messages in thread
From: Sudeep Holla @ 2023-09-27 13:09 UTC (permalink / raw)
To: Liviu Dudau, Kees Cook
Cc: Sudeep Holla, Lorenzo Pieralisi, Rob Herring, Yangtao Li,
linux-arm-kernel, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On Fri, 22 Sep 2023 10:52:35 -0700, Kees Cook 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 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-27 13:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-22 17:52 [PATCH] bus: vexpress-config: Annotate struct vexpress_syscfg_func with __counted_by Kees Cook
2023-09-23 16:35 ` Gustavo A. R. Silva
2023-09-27 13:09 ` Sudeep Holla
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).