* [PATCH] ACPI: PRM: Annotate struct prm_module_info with __counted_by
@ 2023-09-22 17:53 Kees Cook
2023-09-23 16:36 ` Gustavo A. R. Silva
0 siblings, 1 reply; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:53 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Kees Cook, Len Brown, linux-acpi, 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 prm_module_info.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/acpi/prmt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c
index 7020584096bf..c78453c74ef5 100644
--- a/drivers/acpi/prmt.c
+++ b/drivers/acpi/prmt.c
@@ -69,7 +69,7 @@ struct prm_module_info {
bool updatable;
struct list_head module_list;
- struct prm_handler_info handlers[];
+ struct prm_handler_info handlers[] __counted_by(handler_count);
};
static u64 efi_pa_va_lookup(u64 pa)
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ACPI: PRM: Annotate struct prm_module_info with __counted_by
2023-09-22 17:53 [PATCH] ACPI: PRM: Annotate struct prm_module_info with __counted_by Kees Cook
@ 2023-09-23 16:36 ` Gustavo A. R. Silva
2023-10-03 19:26 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:36 UTC (permalink / raw)
To: Kees Cook, Rafael J. Wysocki
Cc: Len Brown, linux-acpi, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On 9/22/23 11:53, 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 prm_module_info.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Len Brown <lenb@kernel.org>
> Cc: linux-acpi@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/acpi/prmt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c
> index 7020584096bf..c78453c74ef5 100644
> --- a/drivers/acpi/prmt.c
> +++ b/drivers/acpi/prmt.c
> @@ -69,7 +69,7 @@ struct prm_module_info {
> bool updatable;
>
> struct list_head module_list;
> - struct prm_handler_info handlers[];
> + struct prm_handler_info handlers[] __counted_by(handler_count);
> };
>
> static u64 efi_pa_va_lookup(u64 pa)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ACPI: PRM: Annotate struct prm_module_info with __counted_by
2023-09-23 16:36 ` Gustavo A. R. Silva
@ 2023-10-03 19:26 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2023-10-03 19:26 UTC (permalink / raw)
To: Gustavo A. R. Silva, Kees Cook
Cc: linux-acpi, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On Sat, Sep 23, 2023 at 11:41 AM Gustavo A. R. Silva
<gustavo@embeddedor.com> wrote:
>
>
>
> On 9/22/23 11:53, 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 prm_module_info.
> >
> > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
> >
> > Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> > Cc: Len Brown <lenb@kernel.org>
> > Cc: linux-acpi@vger.kernel.org
> > Signed-off-by: Kees Cook <keescook@chromium.org>
>
> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Applied as 6.7 material, thanks!
> > ---
> > drivers/acpi/prmt.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c
> > index 7020584096bf..c78453c74ef5 100644
> > --- a/drivers/acpi/prmt.c
> > +++ b/drivers/acpi/prmt.c
> > @@ -69,7 +69,7 @@ struct prm_module_info {
> > bool updatable;
> >
> > struct list_head module_list;
> > - struct prm_handler_info handlers[];
> > + struct prm_handler_info handlers[] __counted_by(handler_count);
> > };
> >
> > static u64 efi_pa_va_lookup(u64 pa)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-03 19:26 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:53 [PATCH] ACPI: PRM: Annotate struct prm_module_info with __counted_by Kees Cook
2023-09-23 16:36 ` Gustavo A. R. Silva
2023-10-03 19:26 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox