]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
dmaengine: uniphier-xdmac: Annotate struct uniphier_xdmac_device with __counted_by
authorKees Cook <keescook@chromium.org>
Thu, 17 Aug 2023 23:58:57 +0000 (16:58 -0700)
committerVinod Koul <vkoul@kernel.org>
Thu, 28 Sep 2023 11:12:15 +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 uniphier_xdmac_device.

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

Cc: Vinod Koul <vkoul@kernel.org>
Cc: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: dmaengine@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230817235859.49846-20-keescook@chromium.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/uniphier-xdmac.c

index dd51522879a7c59dd4cb90817ff1fa4e21aedec6..3a8ee2b173b52e83b775bbe27d5f715a205aef87 100644 (file)
@@ -97,7 +97,7 @@ struct uniphier_xdmac_device {
        struct dma_device ddev;
        void __iomem *reg_base;
        int nr_chans;
-       struct uniphier_xdmac_chan channels[];
+       struct uniphier_xdmac_chan channels[] __counted_by(nr_chans);
 };
 
 static struct uniphier_xdmac_chan *