From: Kees Cook Date: Fri, 22 Sep 2023 17:50:50 +0000 (-0700) Subject: ASoC: apple: mca: Annotate struct mca_data with __counted_by X-Git-Tag: io_uring-6.7-2023-11-10~21^2~1^2~55 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=59825951707eccf92782e109c04772d34fc07eb6;p=linux-block.git ASoC: apple: mca: Annotate struct mca_data 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 mca_data. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Martin PoviĊĦer Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: asahi@lists.linux.dev Cc: alsa-devel@alsa-project.org Signed-off-by: Kees Cook Reviewed-by: "Gustavo A. R. Silva" Link: https://lore.kernel.org/r/20230922175050.work.819-kees@kernel.org Signed-off-by: Mark Brown --- diff --git a/sound/soc/apple/mca.c b/sound/soc/apple/mca.c index 9f64a9e74c54..3780aca71076 100644 --- a/sound/soc/apple/mca.c +++ b/sound/soc/apple/mca.c @@ -161,7 +161,7 @@ struct mca_data { struct mutex port_mutex; int nclusters; - struct mca_cluster clusters[]; + struct mca_cluster clusters[] __counted_by(nclusters); }; static void mca_modify(struct mca_cluster *cl, int regoffset, u32 mask, u32 val)