* [PATCH] mtd: rawnand: atmel: Annotate struct atmel_nand with __counted_by
@ 2023-09-15 20:12 Kees Cook
2023-09-15 20:48 ` Gustavo A. R. Silva
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kees Cook @ 2023-09-15 20:12 UTC (permalink / raw)
To: Tudor Ambarus
Cc: Alexandre Belloni, linux-kernel, Vignesh Raghavendra,
Richard Weinberger, llvm, Nick Desaulniers, Claudiu Beznea,
Nathan Chancellor, Tom Rix, linux-mtd, linux-hardening,
Miquel Raynal, linux-arm-kernel, 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 atmel_nand.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Tudor Ambarus <tudor.ambarus@linaro.org>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Cc: linux-mtd@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index 3f494f7c7ecb..4cb478bbee4a 100644
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -165,7 +165,7 @@ struct atmel_nand {
struct atmel_pmecc_user *pmecc;
struct gpio_desc *cdgpio;
int numcs;
- struct atmel_nand_cs cs[];
+ struct atmel_nand_cs cs[] __counted_by(numcs);
};
static inline struct atmel_nand *to_atmel_nand(struct nand_chip *chip)
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mtd: rawnand: atmel: Annotate struct atmel_nand with __counted_by
2023-09-15 20:12 [PATCH] mtd: rawnand: atmel: Annotate struct atmel_nand with __counted_by Kees Cook
@ 2023-09-15 20:48 ` Gustavo A. R. Silva
2023-09-18 5:21 ` Tudor Ambarus
2023-09-22 14:51 ` Miquel Raynal
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-15 20:48 UTC (permalink / raw)
To: Kees Cook, Tudor Ambarus
Cc: Alexandre Belloni, linux-kernel, Vignesh Raghavendra,
Richard Weinberger, llvm, Nick Desaulniers, Claudiu Beznea,
Nathan Chancellor, Tom Rix, linux-mtd, linux-hardening,
Miquel Raynal, linux-arm-kernel
On 9/15/23 14:12, 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 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 atmel_nand.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Tudor Ambarus <tudor.ambarus@linaro.org>
> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Vignesh Raghavendra <vigneshr@ti.com>
> Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Cc: Claudiu Beznea <claudiu.beznea@tuxon.dev>
> Cc: linux-mtd@lists.infradead.org
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
> index 3f494f7c7ecb..4cb478bbee4a 100644
> --- a/drivers/mtd/nand/raw/atmel/nand-controller.c
> +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
> @@ -165,7 +165,7 @@ struct atmel_nand {
> struct atmel_pmecc_user *pmecc;
> struct gpio_desc *cdgpio;
> int numcs;
> - struct atmel_nand_cs cs[];
> + struct atmel_nand_cs cs[] __counted_by(numcs);
> };
>
> static inline struct atmel_nand *to_atmel_nand(struct nand_chip *chip)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mtd: rawnand: atmel: Annotate struct atmel_nand with __counted_by
2023-09-15 20:12 [PATCH] mtd: rawnand: atmel: Annotate struct atmel_nand with __counted_by Kees Cook
2023-09-15 20:48 ` Gustavo A. R. Silva
@ 2023-09-18 5:21 ` Tudor Ambarus
2023-09-22 14:51 ` Miquel Raynal
2 siblings, 0 replies; 4+ messages in thread
From: Tudor Ambarus @ 2023-09-18 5:21 UTC (permalink / raw)
To: Kees Cook
Cc: Alexandre Belloni, linux-kernel, Vignesh Raghavendra,
Richard Weinberger, llvm, Nick Desaulniers, Claudiu Beznea,
Nathan Chancellor, Tom Rix, linux-mtd, linux-hardening,
Miquel Raynal, linux-arm-kernel
On 15.09.2023 23:12, 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 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 atmel_nand.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Tudor Ambarus <tudor.ambarus@linaro.org>
> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Vignesh Raghavendra <vigneshr@ti.com>
> Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Cc: Claudiu Beznea <claudiu.beznea@tuxon.dev>
> Cc: linux-mtd@lists.infradead.org
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
> ---
> drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
> index 3f494f7c7ecb..4cb478bbee4a 100644
> --- a/drivers/mtd/nand/raw/atmel/nand-controller.c
> +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
> @@ -165,7 +165,7 @@ struct atmel_nand {
> struct atmel_pmecc_user *pmecc;
> struct gpio_desc *cdgpio;
> int numcs;
> - struct atmel_nand_cs cs[];
> + struct atmel_nand_cs cs[] __counted_by(numcs);
> };
>
> static inline struct atmel_nand *to_atmel_nand(struct nand_chip *chip)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mtd: rawnand: atmel: Annotate struct atmel_nand with __counted_by
2023-09-15 20:12 [PATCH] mtd: rawnand: atmel: Annotate struct atmel_nand with __counted_by Kees Cook
2023-09-15 20:48 ` Gustavo A. R. Silva
2023-09-18 5:21 ` Tudor Ambarus
@ 2023-09-22 14:51 ` Miquel Raynal
2 siblings, 0 replies; 4+ messages in thread
From: Miquel Raynal @ 2023-09-22 14:51 UTC (permalink / raw)
To: Kees Cook, Tudor Ambarus
Cc: Alexandre Belloni, linux-kernel, Vignesh Raghavendra,
Richard Weinberger, llvm, Nick Desaulniers, Claudiu Beznea,
Nathan Chancellor, Tom Rix, linux-mtd, linux-hardening,
Miquel Raynal, linux-arm-kernel
On Fri, 2023-09-15 at 20:12:20 UTC, 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 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 atmel_nand.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Tudor Ambarus <tudor.ambarus@linaro.org>
> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Vignesh Raghavendra <vigneshr@ti.com>
> Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Cc: Claudiu Beznea <claudiu.beznea@tuxon.dev>
> Cc: linux-mtd@lists.infradead.org
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.
Miquel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-22 16:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 20:12 [PATCH] mtd: rawnand: atmel: Annotate struct atmel_nand with __counted_by Kees Cook
2023-09-15 20:48 ` Gustavo A. R. Silva
2023-09-18 5:21 ` Tudor Ambarus
2023-09-22 14:51 ` Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox