Skip to contentSkip to conversation

mtd: rawnand: cadence: Annotate struct cdns_nand_chip with __counted_by

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

Subsystems (3)
Memory technology devices (MTD) NAND flash Cadence NAND driver
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 mtd: rawnand: cadence: Annotate struct cdns_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 cdns_nand_chip.

Cc Miquel Raynal <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Vignesh Raghavendra <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc Martin Blumenstingl <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Roger Quadros <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Yang Yingliang <[email protected]>
Cc "Uwe Kleine-König" <[email protected]>
Cc Valentin Korenblit <[email protected]>
Cc ye xingchen <[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/cadence-nand-controller.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/cadence-nand-controller.c +1 -1
index 034ec564c2ed..7d5ef7ffe0fe 100644
@@ -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 {
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 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 cdns_nand_chip.

Quoted 16 lines
Cc Miquel Raynal <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Vignesh Raghavendra <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc Martin Blumenstingl <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Roger Quadros <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Yang Yingliang <[email protected]>
Cc "Uwe Kleine-König" <[email protected]>
Cc Valentin Korenblit <[email protected]>
Cc ye xingchen <[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/cadence-nand-controller.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/cadence-nand-controller.c +1 -1
index 034ec564c2ed..7d5ef7ffe0fe 100644
@@ -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 {
maintainer Applied
#2 lore raw
In reply to Kees Cook
Quoted 17 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 cdns_nand_chip.

Cc Miquel Raynal <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Vignesh Raghavendra <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc Martin Blumenstingl <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Roger Quadros <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Yang Yingliang <[email protected]>
Quoted 8 lines
Cc "Uwe Kleine-König" <[email protected]>
Cc Valentin Korenblit <[email protected]>
Cc ye xingchen <[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