Skip to content

Commit 1442d62

Browse files
keesmiquelraynal
authored andcommitted
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
1 parent f1a9be9 commit 1442d62

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

include/linux/mtd/cfi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ struct cfi_private {
287287
unsigned long chipshift; /* Because they're of the same type */
288288
const char *im_name; /* inter_module name for cmdset_setup */
289289
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 */
291291
};
292292

293293
uint32_t cfi_build_cmd_addr(uint32_t cmd_ofs,

0 commit comments

Comments
 (0)