On 10/6/23 22:17, Kees Cook wrote:
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 cdns_nand_chip.
Cc: Miquel Raynal <miquel.ray...@bootlin.com>
Cc: Richard Weinberger <rich...@nod.at>
Cc: Vignesh Raghavendra <vigne...@ti.com>
Cc: "Gustavo A. R. Silva" <gustavo...@kernel.org>
Cc: Martin Blumenstingl <martin.blumensti...@googlemail.com>
Cc: Nicolas Ferre <nicolas.fe...@microchip.com>
Cc: Roger Quadros <rog...@kernel.org>
Cc: Thierry Reding <tred...@nvidia.com>
Cc: Yang Yingliang <yangyingli...@huawei.com>
Cc: "Uwe Kleine-König" <u.kleine-koe...@pengutronix.de>
Cc: Valentin Korenblit <vkorenb...@sequans.com>
Cc: ye xingchen <ye.xingc...@zte.com.cn>
Cc: linux-...@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>
Reviewed-by: Gustavo A. R. Silva <gustavo...@kernel.org>
Thanks!
--
Gustavo
---
drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c
b/drivers/mtd/nand/raw/cadence-nand-controller.c
index 034ec564c2ed..7d5ef7ffe0fe 100644
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -526,7 +526,7 @@ struct cdns_nand_chip {
/* ECC strength index. */
u8 corr_str_idx;
- u8 cs[];
+ u8 cs[] __counted_by(nsels);
};
struct ecc_info {
