* [PATCH] dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by
@ 2023-09-28 23:43 Kees Cook
2023-10-01 6:46 ` Gustavo A. R. Silva
2023-10-04 14:29 ` Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-28 23:43 UTC (permalink / raw)
To: Vinod Koul
Cc: Kees Cook, Nathan Chancellor, Nick Desaulniers, Tom Rix,
dmaengine, llvm, Gustavo A. R. Silva, linux-kernel,
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 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 ep93xx_dma_engine.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Vinod Koul <vkoul@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Tom Rix <trix@redhat.com>
Cc: dmaengine@vger.kernel.org
Cc: llvm@lists.linux.dev
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/dma/ep93xx_dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index 5c4a448a1254..d6c60635e90d 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -213,7 +213,7 @@ struct ep93xx_dma_engine {
#define INTERRUPT_NEXT_BUFFER 2
size_t num_channels;
- struct ep93xx_dma_chan channels[];
+ struct ep93xx_dma_chan channels[] __counted_by(num_channels);
};
static inline struct device *chan2dev(struct ep93xx_dma_chan *edmac)
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by
2023-09-28 23:43 [PATCH] dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by Kees Cook
@ 2023-10-01 6:46 ` Gustavo A. R. Silva
2023-10-04 14:29 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-10-01 6:46 UTC (permalink / raw)
To: Kees Cook, Vinod Koul
Cc: Nathan Chancellor, Nick Desaulniers, Tom Rix, dmaengine, llvm,
Gustavo A. R. Silva, linux-kernel, linux-hardening
On 9/29/23 01:43, 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 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 ep93xx_dma_engine.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Vinod Koul <vkoul@kernel.org>
> Cc: Nathan Chancellor <nathan@kernel.org>
> Cc: Nick Desaulniers <ndesaulniers@google.com>
> Cc: Tom Rix <trix@redhat.com>
> Cc: dmaengine@vger.kernel.org
> Cc: llvm@lists.linux.dev
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/dma/ep93xx_dma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
> index 5c4a448a1254..d6c60635e90d 100644
> --- a/drivers/dma/ep93xx_dma.c
> +++ b/drivers/dma/ep93xx_dma.c
> @@ -213,7 +213,7 @@ struct ep93xx_dma_engine {
> #define INTERRUPT_NEXT_BUFFER 2
>
> size_t num_channels;
> - struct ep93xx_dma_chan channels[];
> + struct ep93xx_dma_chan channels[] __counted_by(num_channels);
> };
>
> static inline struct device *chan2dev(struct ep93xx_dma_chan *edmac)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by
2023-09-28 23:43 [PATCH] dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by Kees Cook
2023-10-01 6:46 ` Gustavo A. R. Silva
@ 2023-10-04 14:29 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2023-10-04 14:29 UTC (permalink / raw)
To: Kees Cook
Cc: Nathan Chancellor, Nick Desaulniers, Tom Rix, dmaengine, llvm,
Gustavo A. R. Silva, linux-kernel, linux-hardening
On Thu, 28 Sep 2023 16:43:42 -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 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 ep93xx_dma_engine.
>
> [...]
Applied, thanks!
[1/1] dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by
commit: 74d885711c2f619e92f41ef308691948cc63f224
Best regards,
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-04 14:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-28 23:43 [PATCH] dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by Kees Cook
2023-10-01 6:46 ` Gustavo A. R. Silva
2023-10-04 14:29 ` Vinod Koul
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).