Skip to contentSkip to conversation

leds: lm3697: Annotate struct lm3697 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: lm3697: Annotate struct lm3697 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 lm3697.

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

---
 drivers/leds/leds-lm3697.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/leds-lm3697.c +1 -1
index cfb8ac220db6..380d17a58fe9 100644
@@ -89,7 +89,7 @@ struct lm3697 {
 	int bank_cfg;
 	int num_banks;
 
-	struct lm3697_led leds[];
+	struct lm3697_led leds[] __counted_by(num_banks);
 };
 
 static const struct reg_default lm3697_reg_defs[] = {
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 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).

Quoted 8 lines

As found with Coccinelle[1], add __counted_by for struct lm3697.

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

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/leds/leds-lm3697.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/leds-lm3697.c +1 -1
index cfb8ac220db6..380d17a58fe9 100644
@@ -89,7 +89,7 @@ struct lm3697 {
  	int bank_cfg;
  	int num_banks;
 
-	struct lm3697_led leds[];
+	struct lm3697_led leds[] __counted_by(num_banks);
  };
 
  static const struct reg_default lm3697_reg_defs[] = {
maintainer Applied
#2 lore raw

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

[...]

Applied, thanks!

[1/1] leds: lm3697: Annotate struct lm3697 with __counted_by

      commit: 1a210f7d060854f541be9a613bf942849fd5c0b5

--
Lee Jones [李琼斯]