dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by
authorKees Cook <keescook@chromium.org>
Thu, 28 Sep 2023 23:43:42 +0000 (16:43 -0700)
committerVinod Koul <vkoul@kernel.org>
Wed, 4 Oct 2023 09:42:57 +0000 (15:12 +0530)
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>
Link: https://lore.kernel.org/r/20230928234334.work.391-kees@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/ep93xx_dma.c

index 5c4a448a12541ad2ceab2651f22cc2acec53b23f..d6c60635e90db9033386d01468d75e5c380900f3 100644 (file)
@@ -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)