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

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

Cc: Liang Yang <liang.yang@amlogic.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: linux-mtd@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-amlogic@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/20230915201249.never.509-kees@kernel.org
drivers/mtd/nand/raw/meson_nand.c

index 25e3c1cb605e7f95318181616b5470b7cace104d..378f28ce6a740ccc038ee7bc35f81db7b41048b6 100644 (file)
@@ -128,7 +128,7 @@ struct meson_nfc_nand_chip {
        u8 *data_buf;
        __le64 *info_buf;
        u32 nsels;
-       u8 sels[];
+       u8 sels[] __counted_by(nsels);
 };
 
 struct meson_nand_ecc {