* [PATCH] i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by
@ 2023-09-22 17:50 Kees Cook
2023-09-23 16:28 ` Gustavo A. R. Silva
2023-09-25 21:37 ` Alexandre Belloni
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:50 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Kees Cook, Nicolas Pitre, Len Baker, Boris Brezillon, linux-i3c,
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 hci_rings_data.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Nicolas Pitre <npitre@baylibre.com>
Cc: Len Baker <len.baker@gmx.com>
Cc: Boris Brezillon <boris.brezillon@collabora.com>
Cc: linux-i3c@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c
index 2990ac9eaade..a1ecdfc35641 100644
--- a/drivers/i3c/master/mipi-i3c-hci/dma.c
+++ b/drivers/i3c/master/mipi-i3c-hci/dma.c
@@ -139,7 +139,7 @@ struct hci_rh_data {
struct hci_rings_data {
unsigned int total;
- struct hci_rh_data headers[];
+ struct hci_rh_data headers[] __counted_by(total);
};
struct hci_dma_dev_ibi_data {
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by
2023-09-22 17:50 [PATCH] i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by Kees Cook
@ 2023-09-23 16:28 ` Gustavo A. R. Silva
2023-09-25 21:37 ` Alexandre Belloni
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:28 UTC (permalink / raw)
To: Kees Cook, Alexandre Belloni
Cc: Nicolas Pitre, Len Baker, Boris Brezillon, linux-i3c,
Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel, llvm,
linux-hardening
On 9/22/23 11:50, 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 hci_rings_data.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Cc: Nicolas Pitre <npitre@baylibre.com>
> Cc: Len Baker <len.baker@gmx.com>
> Cc: Boris Brezillon <boris.brezillon@collabora.com>
> Cc: linux-i3c@lists.infradead.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c
> index 2990ac9eaade..a1ecdfc35641 100644
> --- a/drivers/i3c/master/mipi-i3c-hci/dma.c
> +++ b/drivers/i3c/master/mipi-i3c-hci/dma.c
> @@ -139,7 +139,7 @@ struct hci_rh_data {
>
> struct hci_rings_data {
> unsigned int total;
> - struct hci_rh_data headers[];
> + struct hci_rh_data headers[] __counted_by(total);
> };
>
> struct hci_dma_dev_ibi_data {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by
2023-09-22 17:50 [PATCH] i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by Kees Cook
2023-09-23 16:28 ` Gustavo A. R. Silva
@ 2023-09-25 21:37 ` Alexandre Belloni
1 sibling, 0 replies; 3+ messages in thread
From: Alexandre Belloni @ 2023-09-25 21:37 UTC (permalink / raw)
To: Kees Cook
Cc: Nicolas Pitre, Len Baker, Boris Brezillon, linux-i3c,
Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel, llvm,
linux-hardening
On Fri, 22 Sep 2023 10:50:19 -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 hci_rings_data.
>
> [...]
Applied, thanks!
[1/1] i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by
commit: 751d377f0f7a09d6122de0e2232133524568c52b
Best regards,
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-25 21:37 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:50 [PATCH] i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by Kees Cook
2023-09-23 16:28 ` Gustavo A. R. Silva
2023-09-25 21:37 ` Alexandre Belloni
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).