Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Commit f316cdff8d67 ("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: f316cdff8d67 ("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>

authored by

Nathan Chancellor and committed by
Stephen Boyd
9368cdf9 4cece764

+2 -1
+2 -1
drivers/clk/bcm/clk-bcm2711-dvp.c
··· 56 56 if (ret) 57 57 return ret; 58 58 59 + data->num = NR_CLOCKS; 60 + 59 61 data->hws[0] = clk_hw_register_gate_parent_data(&pdev->dev, 60 62 "hdmi0-108MHz", 61 63 &clk_dvp_parent, 0, ··· 78 76 goto unregister_clk0; 79 77 } 80 78 81 - data->num = NR_CLOCKS; 82 79 ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get, 83 80 data); 84 81 if (ret)