* Re: [PATCH] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by
2023-09-22 17:53 [PATCH] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by Kees Cook
@ 2023-09-23 16:38 ` Gustavo A. R. Silva
2023-10-02 10:17 ` Michal Simek
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:38 UTC (permalink / raw)
To: Kees Cook, Jassi Brar
Cc: Michal Simek, linux-arm-kernel, 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 zynqmp_ipi_pdata.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Jassi Brar <jassisinghbrar@gmail.com>
> Cc: Michal Simek <michal.simek@amd.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/mailbox/zynqmp-ipi-mailbox.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c
> index e4fcac97dbfa..7fa533e80dd9 100644
> --- a/drivers/mailbox/zynqmp-ipi-mailbox.c
> +++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
> @@ -108,7 +108,7 @@ struct zynqmp_ipi_pdata {
> unsigned int method;
> u32 local_id;
> int num_mboxes;
> - struct zynqmp_ipi_mbox ipi_mboxes[];
> + struct zynqmp_ipi_mbox ipi_mboxes[] __counted_by(num_mboxes);
> };
>
> static struct device_driver zynqmp_ipi_mbox_driver = {
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by
2023-09-22 17:53 [PATCH] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by Kees Cook
2023-09-23 16:38 ` Gustavo A. R. Silva
@ 2023-10-02 10:17 ` Michal Simek
2023-10-03 22:56 ` Justin Stitt
2023-10-06 20:41 ` Kees Cook
3 siblings, 0 replies; 5+ messages in thread
From: Michal Simek @ 2023-10-02 10:17 UTC (permalink / raw)
To: Kees Cook, Jassi Brar
Cc: linux-arm-kernel, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On 9/22/23 19: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 zynqmp_ipi_pdata.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Jassi Brar <jassisinghbrar@gmail.com>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> drivers/mailbox/zynqmp-ipi-mailbox.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c
> index e4fcac97dbfa..7fa533e80dd9 100644
> --- a/drivers/mailbox/zynqmp-ipi-mailbox.c
> +++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
> @@ -108,7 +108,7 @@ struct zynqmp_ipi_pdata {
> unsigned int method;
> u32 local_id;
> int num_mboxes;
> - struct zynqmp_ipi_mbox ipi_mboxes[];
> + struct zynqmp_ipi_mbox ipi_mboxes[] __counted_by(num_mboxes);
> };
>
> static struct device_driver zynqmp_ipi_mbox_driver = {
Acked-by: Michal Simek <michal.simek@amd.com>
Thanks,
Michal
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by
2023-09-22 17:53 [PATCH] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by Kees Cook
2023-09-23 16:38 ` Gustavo A. R. Silva
2023-10-02 10:17 ` Michal Simek
@ 2023-10-03 22:56 ` Justin Stitt
2023-10-06 20:41 ` Kees Cook
3 siblings, 0 replies; 5+ messages in thread
From: Justin Stitt @ 2023-10-03 22:56 UTC (permalink / raw)
To: Kees Cook
Cc: Jassi Brar, Michal Simek, linux-arm-kernel, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening
On Fri, Sep 22, 2023 at 10:54 AM Kees Cook <keescook@chromium.org> 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 zynqmp_ipi_pdata.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Jassi Brar <jassisinghbrar@gmail.com>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
Great patch! Crucially, the count is _correctly_ assigned
to before the flexible array member is accessed.
Reviewed-by: Justin Stitt <justinstitt@google.com>
> drivers/mailbox/zynqmp-ipi-mailbox.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c
> index e4fcac97dbfa..7fa533e80dd9 100644
> --- a/drivers/mailbox/zynqmp-ipi-mailbox.c
> +++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
> @@ -108,7 +108,7 @@ struct zynqmp_ipi_pdata {
> unsigned int method;
> u32 local_id;
> int num_mboxes;
> - struct zynqmp_ipi_mbox ipi_mboxes[];
> + struct zynqmp_ipi_mbox ipi_mboxes[] __counted_by(num_mboxes);
> };
>
> static struct device_driver zynqmp_ipi_mbox_driver = {
> --
> 2.34.1
>
>
Thanks
Justin
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by
2023-09-22 17:53 [PATCH] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by Kees Cook
` (2 preceding siblings ...)
2023-10-03 22:56 ` Justin Stitt
@ 2023-10-06 20:41 ` Kees Cook
3 siblings, 0 replies; 5+ messages in thread
From: Kees Cook @ 2023-10-06 20:41 UTC (permalink / raw)
To: Jassi Brar, Kees Cook
Cc: Michal Simek, linux-arm-kernel, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening
On Fri, 22 Sep 2023 10:53:51 -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 zynqmp_ipi_pdata.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by
https://git.kernel.org/kees/c/6b607a3a311a
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 5+ messages in thread