Skip to content

Commit 9368cdf

Browse files
nathanchancebebarino
authored andcommitted
clk: bcm: dvp: Assign ->num before accessing ->hws
Commit f316cdf ("clk: Annotate struct clk_hw_onecell_data with __counted_by") annotated the hws member of 'struct clk_hw_onecell_data' with __counted_by, which informs the bounds sanitizer about the number of elements in hws, so that it can warn when hws is accessed out of bounds. As noted in that change, the __counted_by member must be initialized with the number of elements before the first array access happens, otherwise there will be a warning from each access prior to the initialization because the number of elements is zero. This occurs in clk_dvp_probe() due to ->num being assigned after ->hws has been accessed: UBSAN: array-index-out-of-bounds in drivers/clk/bcm/clk-bcm2711-dvp.c:59:2 index 0 is out of range for type 'struct clk_hw *[] __counted_by(num)' (aka 'struct clk_hw *[]') Move the ->num initialization to before the first access of ->hws, which clears up the warning. Cc: stable@vger.kernel.org Fixes: f316cdf ("clk: Annotate struct clk_hw_onecell_data with __counted_by") Signed-off-by: Nathan Chancellor <nathan@kernel.org> Link: https://lore.kernel.org/r/20240425-cbl-bcm-assign-counted-by-val-before-access-v1-1-e2db3b82d5ef@kernel.org Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 4cece76 commit 9368cdf

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/clk/bcm/clk-bcm2711-dvp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ static int clk_dvp_probe(struct platform_device *pdev)
5656
if (ret)
5757
return ret;
5858

59+
data->num = NR_CLOCKS;
60+
5961
data->hws[0] = clk_hw_register_gate_parent_data(&pdev->dev,
6062
"hdmi0-108MHz",
6163
&clk_dvp_parent, 0,
@@ -76,7 +78,6 @@ static int clk_dvp_probe(struct platform_device *pdev)
7678
goto unregister_clk0;
7779
}
7880

79-
data->num = NR_CLOCKS;
8081
ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get,
8182
data);
8283
if (ret)

0 commit comments

Comments
 (0)