Skip to contentSkip to conversation

leds: mt6360: Annotate struct mt6360_priv with __counted_by

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

Subsystems (2)
Arm MediaTek LED
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 leds: mt6360: Annotate struct mt6360_priv 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 mt6360_priv.

[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 Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>
Cc Gene Chen <[email protected]>
Cc Jacek Anaszewski <[email protected]>
Cc Andy Shevchenko <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/leds/flash/leds-mt6360.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/flash/leds-mt6360.c +1 -1
index 1af6c5898343..b70dc689b33f 100644
@@ -91,7 +91,7 @@ struct mt6360_priv {
 	unsigned int fled_torch_used;
 	unsigned int leds_active;
 	unsigned int leds_count;
-	struct mt6360_led leds[];
+	struct mt6360_led leds[] __counted_by(leds_count);
 };
 
 static int mt6360_mc_brightness_set(struct led_classdev *lcdev,
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 mt6360_priv.

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

Quoted 11 lines
Cc Pavel Machek <[email protected]>
Cc Lee Jones <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>
Cc Gene Chen <[email protected]>
Cc Jacek Anaszewski <[email protected]>
Cc Andy Shevchenko <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
Reviewed-by Gustavo A. R. Silva <[email protected]>

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/leds/flash/leds-mt6360.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/flash/leds-mt6360.c +1 -1
index 1af6c5898343..b70dc689b33f 100644
@@ -91,7 +91,7 @@ struct mt6360_priv {
  	unsigned int fled_torch_used;
  	unsigned int leds_active;
  	unsigned int leds_count;
-	struct mt6360_led leds[];
+	struct mt6360_led leds[] __counted_by(leds_count);
  };
 
  static int mt6360_mc_brightness_set(struct led_classdev *lcdev,
maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Kees Cook

Il 15/09/23 22:10, Kees Cook ha scritto:

Quoted 10 lines

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

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

Quoted 11 lines
Cc Pavel Machek <[email protected]>
Cc Lee Jones <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>
Cc Gene Chen <[email protected]>
Cc Jacek Anaszewski <[email protected]>
Cc Andy Shevchenko <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
Reviewed-by AngeloGioacchino Del Regno <[email protected]>
maintainer Applied
#3 lore raw

Re: (subset) [PATCH] leds: mt6360: Annotate struct mt6360_priv 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 mt6360_priv.

[...]

Applied, thanks!

[1/1] leds: mt6360: Annotate struct mt6360_priv with __counted_by

      commit: cecdfff8f5c82816d8b9ef2f4b3d7f4943dfd360

--
Lee Jones [李琼斯]