Skip to contentSkip to conversation

leds: qcom-lpg: Annotate struct lpg_led with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Sep 15, 2023 – Sep 20, 2023 LED

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 leds: qcom-lpg: Annotate struct lpg_led 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 lpg_led.

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

Cc Pavel Machek <[email protected]>
Cc Lee Jones <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc "Uwe Kleine-König" <[email protected]>
Cc Douglas Anderson <[email protected]>
Cc Anjelique Melendez <[email protected]>
---
 drivers/leds/rgb/leds-qcom-lpg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/rgb/leds-qcom-lpg.c +1 -1
index df469aaa7e6e..7d93e02a030a 100644
@@ -173,7 +173,7 @@ struct lpg_led {
 	struct led_classdev_mc mcdev;
 
 	unsigned int num_channels;
-	struct lpg_channel *channels[];
+	struct lpg_channel *channels[] __counted_by(num_channels);
 };
 
 /**
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Kees Cook

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 lpg_led.

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

Quoted 8 lines
Cc Pavel Machek <[email protected]>
Cc Lee Jones <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc "Uwe Kleine-König" <[email protected]>
Cc Douglas Anderson <[email protected]>
Cc Anjelique Melendez <[email protected]>

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/leds/rgb/leds-qcom-lpg.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/rgb/leds-qcom-lpg.c +1 -1
index df469aaa7e6e..7d93e02a030a 100644
@@ -173,7 +173,7 @@ struct lpg_led {
  	struct led_classdev_mc mcdev;
 
  	unsigned int num_channels;
-	struct lpg_channel *channels[];
+	struct lpg_channel *channels[] __counted_by(num_channels);
  };
 
  /**
maintainer Applied
#2 lore raw

Re: (subset) [PATCH] leds: qcom-lpg: Annotate struct lpg_led with __counted_by

In reply to Kees Cook
Quoted 9 lines · Kees Cook

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 lpg_led.

[...]

Applied, thanks!

[1/1] leds: qcom-lpg: Annotate struct lpg_led with __counted_by

      commit: 3a2a14ad346d60da60aef0a2afc1fb256a56c83c

--
Lee Jones [李琼斯]