Commit e9e9a674 authored Jun 28, 2024 by Nathan Chancellor Committed by Huang Xiaojia Jun 28, 2024

clk: bcm: dvp: Assign ->num before accessing ->hws

stable inclusion
from stable-v6.6.34
commit 0dc913217fb79096597005bba9ba738e2db5cd02
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA8AEG
CVE: CVE-2024-39462

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0dc913217fb79096597005bba9ba738e2db5cd02



--------------------------------

commit 9368cdf90f52a68120d039887ccff74ff33b4444 upstream.

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 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: f316cdff ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Huang Xiaojia <huangxiaojia2@huawei.com>

parent 26e63d23

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,8 @@ static int clk_dvp_probe(struct platform_device *pdev)
		if (ret)
		return ret;

		data->num = NR_CLOCKS;

		data->hws[0] = clk_hw_register_gate_parent_data(&pdev->dev,
		"hdmi0-108MHz",
		&clk_dvp_parent, 0,
		@@ -76,7 +78,6 @@ static int clk_dvp_probe(struct platform_device *pdev)
		goto unregister_clk0;
		}

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