Skip to contentSkip to conversation

pinctrl: uniphier: Annotate struct uniphier_pinctrl_reg_region with __counted_by

PATCH In review Kees Cook 3 participants 3 messages Sep 22, 2023 – Sep 27, 2023

Subsystems (3)
GPIO Pin control Arm/uniphier architecture
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 pinctrl: uniphier: Annotate struct uniphier_pinctrl_reg_region 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 uniphier_pinctrl_reg_region.

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

Cc Linus Walleij <[email protected]>
Cc Kunihiko Hayashi <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/uniphier/pinctrl-uniphier-core.c +1 -1
index 18d3a4f69e63..fbd0fcdb42c8 100644
@@ -31,7 +31,7 @@ struct uniphier_pinctrl_reg_region {
 	struct list_head node;
 	unsigned int base;
 	unsigned int nregs;
-	u32 vals[];
+	u32 vals[] __counted_by(nregs);
 };
 
 struct uniphier_pinctrl_priv {
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 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 uniphier_pinctrl_reg_region.

Quoted 8 lines

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

Cc Linus Walleij <[email protected]>
Cc Kunihiko Hayashi <[email protected]>
Cc Masami Hiramatsu <[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/pinctrl/uniphier/pinctrl-uniphier-core.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/uniphier/pinctrl-uniphier-core.c +1 -1
index 18d3a4f69e63..fbd0fcdb42c8 100644
@@ -31,7 +31,7 @@ struct uniphier_pinctrl_reg_region {
  	struct list_head node;
  	unsigned int base;
  	unsigned int nregs;
-	u32 vals[];
+	u32 vals[] __counted_by(nregs);
  };
 
  struct uniphier_pinctrl_priv {
#2 lore raw
In reply to Kees Cook
Quoted 8 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 uniphier_pinctrl_reg_region.

Quoted 8 lines

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

Cc Linus Walleij <[email protected]>
Cc Kunihiko Hayashi <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>

Excellent!
Patch applied.

Yours,
Linus Walleij