Skip to contentSkip to conversation

leds: mt6370: Annotate struct mt6370_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: mt6370: Annotate struct mt6370_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 mt6370_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 Alice Chen <[email protected]>
Cc Jacek Anaszewski <[email protected]>
Cc ChiYuan Huang <[email protected]>
Cc ChiaEn Wu <[email protected]>
Cc kernel test robot <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/leds/flash/leds-mt6370-flash.c | 2 +-
 drivers/leds/rgb/leds-mt6370-rgb.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/leds/flash/leds-mt6370-flash.c +1 -1
index 931067c8a75f..912d9d622320 100644
@@ -81,7 +81,7 @@ struct mt6370_priv {
 	unsigned int fled_torch_used;
 	unsigned int leds_active;
 	unsigned int leds_count;
-	struct mt6370_led leds[];
+	struct mt6370_led leds[] __counted_by(leds_count);
 };
 
 static int mt6370_torch_brightness_set(struct led_classdev *lcdev, enum led_brightness level)
drivers/leds/rgb/leds-mt6370-rgb.c +1 -1
index bb62431efe83..448d0da11848 100644
@@ -153,7 +153,7 @@ struct mt6370_priv {
 	const struct mt6370_pdata *pdata;
 	unsigned int leds_count;
 	unsigned int leds_active;
-	struct mt6370_led leds[];
+	struct mt6370_led leds[] __counted_by(leds_count);
 };
 
 static const struct reg_field common_reg_fields[F_MAX_FIELDS] = {
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 mt6370_priv.

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

Quoted 13 lines
Cc Pavel Machek <[email protected]>
Cc Lee Jones <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>
Cc Alice Chen <[email protected]>
Cc Jacek Anaszewski <[email protected]>
Cc ChiYuan Huang <[email protected]>
Cc ChiaEn Wu <[email protected]>
Cc kernel test robot <[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 31 lines
---
  drivers/leds/flash/leds-mt6370-flash.c | 2 +-
  drivers/leds/rgb/leds-mt6370-rgb.c     | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/leds/flash/leds-mt6370-flash.c +1 -1
index 931067c8a75f..912d9d622320 100644
@@ -81,7 +81,7 @@ struct mt6370_priv {
  	unsigned int fled_torch_used;
  	unsigned int leds_active;
  	unsigned int leds_count;
-	struct mt6370_led leds[];
+	struct mt6370_led leds[] __counted_by(leds_count);
  };
 
  static int mt6370_torch_brightness_set(struct led_classdev *lcdev, enum led_brightness level)
drivers/leds/rgb/leds-mt6370-rgb.c +1 -1
index bb62431efe83..448d0da11848 100644
@@ -153,7 +153,7 @@ struct mt6370_priv {
  	const struct mt6370_pdata *pdata;
  	unsigned int leds_count;
  	unsigned int leds_active;
-	struct mt6370_led leds[];
+	struct mt6370_led leds[] __counted_by(leds_count);
  };
 
  static const struct reg_field common_reg_fields[F_MAX_FIELDS] = {
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 mt6370_priv.

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

Quoted 13 lines
Cc Pavel Machek <[email protected]>
Cc Lee Jones <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>
Cc Alice Chen <[email protected]>
Cc Jacek Anaszewski <[email protected]>
Cc ChiYuan Huang <[email protected]>
Cc ChiaEn Wu <[email protected]>
Cc kernel test robot <[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: mt6370: Annotate struct mt6370_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 mt6370_priv.

[...]

Applied, thanks!

[1/1] leds: mt6370: Annotate struct mt6370_priv with __counted_by

      commit: 799107c1bb9049f9b3f28b5d651e336d09856019

--
Lee Jones [李琼斯]