]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mtd: rawnand: ingenic: Annotate struct ingenic_nfc with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 15 Sep 2023 20:12:35 +0000 (13:12 -0700)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Fri, 22 Sep 2023 14:33:27 +0000 (16:33 +0200)
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 ingenic_nfc.

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

Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: linux-mips@vger.kernel.org
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230915201234.never.868-kees@kernel.org
drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c

index 6748226b8bd12fd989939ca0d6f02bd1e16f0d83..ce9ef4e65597e2ac1c8bddcd61c183723ff1b7ee 100644 (file)
@@ -46,7 +46,7 @@ struct ingenic_nfc {
        struct nand_controller controller;
        unsigned int num_banks;
        struct list_head chips;
-       struct ingenic_nand_cs cs[];
+       struct ingenic_nand_cs cs[] __counted_by(num_banks);
 };
 
 struct ingenic_nand {