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 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 mtk_nfc_nand_chip. Cc: Miquel Raynal <miquel.ray...@bootlin.com> Cc: Richard Weinberger <rich...@nod.at> Cc: Vignesh Raghavendra <vigne...@ti.com> Cc: Matthias Brugger <matthias....@gmail.com> Cc: AngeloGioacchino Del Regno <angelogioacchino.delre...@collabora.com> Cc: "Gustavo A. R. Silva" <gustavo...@kernel.org> Cc: Heiko Stuebner <he...@sntech.de> Cc: Martin Blumenstingl <martin.blumensti...@googlemail.com> Cc: Thierry Reding <tred...@nvidia.com> Cc: Roger Quadros <rog...@kernel.org> Cc: "Uwe Kleine-König" <u.kleine-koe...@pengutronix.de> Cc: Cai Huoqing <cai.huoq...@linux.dev> Cc: Chuanhong Guo <gch981...@gmail.com> Cc: Rob Herring <r...@kernel.org> Cc: Li Zetao <lizet...@huawei.com> Cc: linux-...@lists.infradead.org Cc: linux-arm-ker...@lists.infradead.org Cc: linux-media...@lists.infradead.org Cc: linux-hardening@vger.kernel.org Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1] Signed-off-by: Kees Cook <keesc...@chromium.org> --- drivers/mtd/nand/raw/mtk_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c index 29c8bddde67f..60198e33d2d5 100644 --- a/drivers/mtd/nand/raw/mtk_nand.c +++ b/drivers/mtd/nand/raw/mtk_nand.c @@ -130,7 +130,7 @@ struct mtk_nfc_nand_chip { u32 spare_per_sector; int nsels; - u8 sels[]; + u8 sels[] __counted_by(nsels); /* nothing after this field */ }; -- 2.34.1
