From: Kees Cook Date: Sat, 14 Oct 2023 03:04:12 +0000 (-0700) Subject: Input: Annotate struct ff_device with __counted_by X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=787650cc335201a0489905c5504a9179470ebc51;p=users%2Fjedix%2Flinux-maple.git Input: Annotate struct ff_device 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 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 ff_device. Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Link: https://lore.kernel.org/r/20231006201739.work.350-kees@kernel.org Signed-off-by: Dmitry Torokhov --- diff --git a/include/linux/input.h b/include/linux/input.h index 49790c1bd2c43..de6503c0edb8e 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -562,7 +562,7 @@ struct ff_device { int max_effects; struct ff_effect *effects; - struct file *effect_owners[]; + struct file *effect_owners[] __counted_by(max_effects); }; int input_ff_create(struct input_dev *dev, unsigned int max_effects);