dmaengine: at_hdmac: Annotate struct at_desc with __counted_by
authorKees Cook <keescook@chromium.org>
Thu, 17 Aug 2023 23:58:39 +0000 (16:58 -0700)
committerVinod Koul <vkoul@kernel.org>
Thu, 28 Sep 2023 11:12:02 +0000 (16:42 +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 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 at_desc.

[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

Cc: Vinod Koul <vkoul@kernel.org>
Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: Tudor Ambarus <tudor.ambarus@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: dmaengine@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230817235859.49846-2-keescook@chromium.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/at_hdmac.c

index 417a942..fb89ecb 100644 (file)
@@ -239,7 +239,7 @@ struct at_desc {
        bool                            memset_buffer;
        dma_addr_t                      memset_paddr;
        int                             *memset_vaddr;
-       struct atdma_sg                 sg[];
+       struct atdma_sg                 sg[] __counted_by(sglen);
 };
 
 /*--  Channels  --------------------------------------------------------*/