]> www.infradead.org Git - linux.git/commitdiff
interconnect: qcom: icc-rpm: Set the count member before accessing the flex array
authorGeorgi Djakov <djakov@kernel.org>
Tue, 3 Dec 2024 22:33:34 +0000 (00:33 +0200)
committerGeorgi Djakov <djakov@kernel.org>
Tue, 17 Dec 2024 12:03:02 +0000 (14:03 +0200)
The following UBSAN error is reported during boot on the db410c board on
a clang-19 build:

Internal error: UBSAN: array index out of bounds: 00000000f2005512 [#1] PREEMPT SMP
...
pc : qnoc_probe+0x5f8/0x5fc
...

The cause of the error is that the counter member was not set before
accessing the annotated flexible array member, but after that. Fix this
by initializing it earlier.

Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
Closes: https://lore.kernel.org/r/CA+G9fYs+2mBz1y2dAzxkj9-oiBJ2Acm1Sf1h2YQ3VmBqj_VX2g@mail.gmail.com
Fixes: dd4904f3b924 ("interconnect: qcom: Annotate struct icc_onecell_data with __counted_by")
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20241203223334.233404-1-djakov@kernel.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>
drivers/interconnect/qcom/icc-rpm.c

index a8ed435f696c67cd406092d8662b13ea7ce34273..ea1042d381287a97a58286e9c41e6275caf13e19 100644 (file)
@@ -503,6 +503,7 @@ int qnoc_probe(struct platform_device *pdev)
                            GFP_KERNEL);
        if (!data)
                return -ENOMEM;
+       data->num_nodes = num_nodes;
 
        qp->num_intf_clks = cd_num;
        for (i = 0; i < cd_num; i++)
@@ -597,7 +598,6 @@ regmap_done:
 
                data->nodes[i] = node;
        }
-       data->num_nodes = num_nodes;
 
        clk_bulk_disable_unprepare(qp->num_intf_clks, qp->intf_clks);