Unverified Commit cf33f0b7 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Stephen Boyd
Browse files

clk: samsung: exynos-clkout: Assign .num before accessing .hws 



Commit f316cdff ("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: f316cdff ("clk: Annotate struct clk_hw_onecell_data with __counted_by")
Reported-by: default avatarJochen Sprickerhof <jochen@sprickerhof.de>
Closes: https://lore.kernel.org/aSIYDN5eyKFKoXKL@eldamar.lan/


Tested-by: default avatarJochen Sprickerhof <jochen@sprickerhof.de>
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarKees Cook <kees@kernel.org>
Reviewed-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 17490011

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

+1 −1
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ static int exynos_clkout_probe(struct platform_device *pdev) 
	clkout->mux.shift = EXYNOS_CLKOUT_MUX_SHIFT;

	clkout->mux.lock = &clkout->slock;



	clkout->data.num = EXYNOS_CLKOUT_NR_CLKS;

	clkout->data.hws[0] = clk_hw_register_composite(NULL, "clkout",

				parent_names, parent_count, &clkout->mux.hw,

				&clk_mux_ops, NULL, NULL, &clkout->gate.hw,
@@ -185,7 +186,6 @@ static int exynos_clkout_probe(struct platform_device *pdev) 
		goto err_unmap;

	}



	clkout->data.num = EXYNOS_CLKOUT_NR_CLKS;

	ret = of_clk_add_hw_provider(clkout->np, of_clk_hw_onecell_get, &clkout->data);

	if (ret)

		goto err_clk_unreg;