[PATCH] mtd: rawnand: marvell: Annotate struct marvell_nand_chip with __counted_by

Gustavo A. R. Silva gustavo at embeddedor.com
Fri Sep 15 13:49:22 PDT 2023



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 marvell_nand_chip.
> 
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
> 
> Cc: Miquel Raynal <miquel.raynal at bootlin.com>
> Cc: Richard Weinberger <richard at nod.at>
> Cc: Vignesh Raghavendra <vigneshr at ti.com>
> Cc: linux-mtd at lists.infradead.org
> Signed-off-by: Kees Cook <keescook at chromium.org>

Reviewed-by: Gustavo A. R. Silva <gustavoars at kernel.org>

Thanks
-- 
Gustavo

> ---
>   drivers/mtd/nand/raw/marvell_nand.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
> index b841a81cb128..a46698744850 100644
> --- a/drivers/mtd/nand/raw/marvell_nand.c
> +++ b/drivers/mtd/nand/raw/marvell_nand.c
> @@ -348,7 +348,7 @@ struct marvell_nand_chip {
>   	int addr_cyc;
>   	int selected_die;
>   	unsigned int nsels;
> -	struct marvell_nand_chip_sel sels[];
> +	struct marvell_nand_chip_sel sels[] __counted_by(nsels);
>   };
>   
>   static inline struct marvell_nand_chip *to_marvell_nand(struct nand_chip *chip)



More information about the linux-mtd mailing list