mtd: rawnand: renesas: Annotate struct rnand_chip with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Sep 15, 2023 – Sep 22, 2023

Subsystems (3)

Memory technology devices (MTD) NAND flash Renesas R-Car GEN3 & RZ/N1 NAND controller driver

lore

Share & tools

lore

Kees Cook

author

2023-09-15 20:12 UTC #0 lore raw

PATCH 1/1 mtd: rawnand: renesas: Annotate struct rnand_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 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 rnand_chip.

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

Cc Miquel Raynal <[email protected]>

Cc Richard Weinberger <[email protected]>

Cc Vignesh Raghavendra <[email protected]>

Cc [email protected]

Signed-off-by Kees Cook <[email protected]>

---
 drivers/mtd/nand/raw/renesas-nand-controller.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/mtd/nand/raw/renesas-nand-controller.c +1 -1

index 589021ea9eb2..c9a01feff8df 100644
@@ -210,7 +210,7 @@ struct rnand_chip {
 	u32 tim_gen_seq1;
 	u32 tim_gen_seq2;
 	u32 tim_gen_seq3;
-	struct rnand_chip_sel sels[];
+	struct rnand_chip_sel sels[] __counted_by(nsels);
 };
 
 struct rnandc {

Signature · 1 line

2.34.1

Gustavo A. R. Silva

Reviewed-by on v1 1/1

2023-09-15 20:48 UTC #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 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 rnand_chip.

Quoted 8 lines

[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Miquel Raynal <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Vignesh Raghavendra <[email protected]>
Cc [email protected]
Cc [email protected]
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/renesas-nand-controller.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

drivers/mtd/nand/raw/renesas-nand-controller.c +1 -1

index 589021ea9eb2..c9a01feff8df 100644
@@ -210,7 +210,7 @@ struct rnand_chip {
  	u32 tim_gen_seq1;
  	u32 tim_gen_seq2;
  	u32 tim_gen_seq3;
-	struct rnand_chip_sel sels[];
+	struct rnand_chip_sel sels[] __counted_by(nsels);
  };
 
  struct rnandc {

Miquel Raynal

maintainer Applied

2023-09-22 14:51 UTC #2 lore raw

In reply to Kees Cook

Quoted 10 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 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 rnand_chip.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

Quoted 7 lines

Cc Miquel Raynal <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Vignesh Raghavendra <[email protected]>
Cc [email protected]
Cc [email protected]
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 mtd/next, thanks.

Miquel