Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: cfi: Annotate struct cfi_private 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 cfi_private.

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

Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230915201206.never.107-kees@kernel.org

authored by

Kees Cook and committed by
Miquel Raynal
1442d628 f1a9be98

+1 -1
+1 -1
include/linux/mtd/cfi.h
··· 287 287 unsigned long chipshift; /* Because they're of the same type */ 288 288 const char *im_name; /* inter_module name for cmdset_setup */ 289 289 unsigned long quirks; 290 - struct flchip chips[]; /* per-chip data structure for each chip */ 290 + struct flchip chips[] __counted_by(numchips); /* per-chip data structure for each chip */ 291 291 }; 292 292 293 293 uint32_t cfi_build_cmd_addr(uint32_t cmd_ofs,