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

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

Cc: Vinod Koul <vkoul@kernel.org>
Cc: Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
Cc: linux-arm-msm@vger.kernel.org
Cc: dmaengine@vger.kernel.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-7-keescook@chromium.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/qcom/bam_dma.c

index c4f8d17d0c68adc7b6d1f50eec87c0139dfedc67..5e7d332731e0c111792b51b23f28e35d7463ff5f 100644 (file)
@@ -74,7 +74,7 @@ struct bam_async_desc {
        struct list_head desc_node;
        enum dma_transfer_direction dir;
        size_t length;
-       struct bam_desc_hw desc[];
+       struct bam_desc_hw desc[] __counted_by(num_desc);
 };
 
 enum bam_reg {