Skip to contentSkip to conversation

mtd: rawnand: Annotate struct mtk_nfc_nand_chip with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Oct 6, 2023 – Oct 16, 2023

Subsystems (4)
Memory technology devices (MTD) Arm MediaTek NAND flash MediaTek NAND controller driver
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 mtd: rawnand: Annotate struct mtk_nfc_nand_chip with __counted_by

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 <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Vignesh Raghavendra <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc Heiko Stuebner <[email protected]>
Cc Martin Blumenstingl <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Roger Quadros <[email protected]>
Cc "Uwe Kleine-König" <[email protected]>
Cc Cai Huoqing <[email protected]>
Cc Chuanhong Guo <[email protected]>
Cc Rob Herring <[email protected]>
Cc Li Zetao <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Link https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/mtd/nand/raw/mtk_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/mtk_nand.c +1 -1
index 29c8bddde67f..60198e33d2d5 100644
@@ -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 */
 };
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 22 lines · Kees Cook

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 <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Vignesh Raghavendra <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc Heiko Stuebner <[email protected]>
Cc Martin Blumenstingl <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Roger Quadros <[email protected]>
Cc "Uwe Kleine-König" <[email protected]>
Cc Cai Huoqing <[email protected]>
Cc Chuanhong Guo <[email protected]>
Quoted 8 lines
Cc Rob Herring <[email protected]>
Cc Li Zetao <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Link https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by Kees Cook <[email protected]>
Reviewed-by Gustavo A. R. Silva <[email protected]>

Thanks!

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/mtd/nand/raw/mtk_nand.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/mtk_nand.c +1 -1
index 29c8bddde67f..60198e33d2d5 100644
@@ -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 */
  };
maintainer Applied
#2 lore raw
In reply to Kees Cook
Quoted 23 lines · Kees Cook

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 <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Vignesh Raghavendra <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc Heiko Stuebner <[email protected]>
Cc Martin Blumenstingl <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Roger Quadros <[email protected]>
Cc "Uwe Kleine-König" <[email protected]>
Cc Cai Huoqing <[email protected]>
Cc Chuanhong Guo <[email protected]>
Cc Rob Herring <[email protected]>
Quoted 8 lines
Cc Li Zetao <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Link https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by Kees Cook <[email protected]>
Reviewed-by Gustavo A. R. Silva <[email protected]>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.

Miquel