Skip to content

Commit cf33f0b

Browse files
nathanchancebebarino
authored andcommitted
clk: samsung: exynos-clkout: 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 (UBSAN_BOUNDS) 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 exynos_clkout_probe() due to .num being assigned after .hws[] has been accessed: UBSAN: array-index-out-of-bounds in drivers/clk/samsung/clk-exynos-clkout.c:178:18 index 0 is out of range for type 'clk_hw *[*]' Move the .num initialization to before the first access of .hws[], clearing up the warning. Cc: stable@vger.kernel.org Fixes: f316cdf ("clk: Annotate struct clk_hw_onecell_data with __counted_by") Reported-by: Jochen Sprickerhof <jochen@sprickerhof.de> Closes: https://lore.kernel.org/aSIYDN5eyKFKoXKL@eldamar.lan/ Tested-by: Jochen Sprickerhof <jochen@sprickerhof.de> Signed-off-by: Nathan Chancellor <nathan@kernel.org> Reviewed-by: Kees Cook <kees@kernel.org> Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 1749001 commit cf33f0b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/clk/samsung/clk-exynos-clkout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ static int exynos_clkout_probe(struct platform_device *pdev)
175175
clkout->mux.shift = EXYNOS_CLKOUT_MUX_SHIFT;
176176
clkout->mux.lock = &clkout->slock;
177177

178+
clkout->data.num = EXYNOS_CLKOUT_NR_CLKS;
178179
clkout->data.hws[0] = clk_hw_register_composite(NULL, "clkout",
179180
parent_names, parent_count, &clkout->mux.hw,
180181
&clk_mux_ops, NULL, NULL, &clkout->gate.hw,
@@ -185,7 +186,6 @@ static int exynos_clkout_probe(struct platform_device *pdev)
185186
goto err_unmap;
186187
}
187188

188-
clkout->data.num = EXYNOS_CLKOUT_NR_CLKS;
189189
ret = of_clk_add_hw_provider(clkout->np, of_clk_hw_onecell_get, &clkout->data);
190190
if (ret)
191191
goto err_clk_unreg;

0 commit comments

Comments
 (0)