Skip to contentSkip to conversation

clk: qcom: clk-spmi-pmic-div: Annotate struct spmi_pmic_div_clk_cc with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Aug 17, 2023 – Aug 22, 2023

Subsystems (3)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 clk: qcom: clk-spmi-pmic-div: Annotate struct spmi_pmic_div_clk_cc 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 spmi_pmic_div_clk_cc.

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

Cc Bjorn Andersson <[email protected]>
Cc Andy Gross <[email protected]>
Cc Konrad Dybcio <[email protected]>
Cc Michael Turquette <[email protected]>
Cc Stephen Boyd <[email protected]>
---
 drivers/clk/qcom/clk-spmi-pmic-div.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/clk-spmi-pmic-div.c +1 -1
index f846be285f51..f394031eb0e5 100644
@@ -177,7 +177,7 @@ static const struct clk_ops clk_spmi_pmic_div_ops = {
 
 struct spmi_pmic_div_clk_cc {
 	int		nclks;
-	struct clkdiv	clks[];
+	struct clkdiv	clks[] __counted_by(nclks);
 };
 
 static struct clk_hw *
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 spmi_pmic_div_clk_cc.

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

Quoted 8 lines
Cc Bjorn Andersson <[email protected]>
Cc Andy Gross <[email protected]>
Cc Konrad Dybcio <[email protected]>
Cc Michael Turquette <[email protected]>
Cc Stephen Boyd <[email protected]>

Thanks
--
Gustavo

Quoted 17 lines
---
  drivers/clk/qcom/clk-spmi-pmic-div.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/clk-spmi-pmic-div.c +1 -1
index f846be285f51..f394031eb0e5 100644
@@ -177,7 +177,7 @@ static const struct clk_ops clk_spmi_pmic_div_ops = {
 
  struct spmi_pmic_div_clk_cc {
  	int		nclks;
-	struct clkdiv	clks[];
+	struct clkdiv	clks[] __counted_by(nclks);
  };
 
  static struct clk_hw *
maintainer Applied
#2 lore raw
In reply to Kees Cook

Quoting Kees Cook (2023-08-17 13:29:42)

Quoted 18 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 spmi_pmic_div_clk_cc.

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

Cc Bjorn Andersson <[email protected]>
Cc Andy Gross <[email protected]>
Cc Konrad Dybcio <[email protected]>
Cc Michael Turquette <[email protected]>
Cc Stephen Boyd <[email protected]>
Quoted 1 line

---

Applied to clk-next