Input: leds - annotate struct input_leds with __counted_by
authorKees Cook <keescook@chromium.org>
Sat, 30 Sep 2023 16:19:13 +0000 (09:19 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 30 Sep 2023 16:24:16 +0000 (09:24 -0700)
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 input_leds.

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

Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230922175031.work.467-kees@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/input-leds.c

index 0b11990ade465022ecaa329ff9653376bb12a695..0e935914bc3aa1ba7cea72a2a6c1e8e01a4a321c 100644 (file)
@@ -44,7 +44,7 @@ struct input_led {
 struct input_leds {
        struct input_handle handle;
        unsigned int num_leds;
-       struct input_led leds[];
+       struct input_led leds[] __counted_by(num_leds);
 };
 
 static enum led_brightness input_leds_brightness_get(struct led_classdev *cdev)