Merge tag 'icc-6.13-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next

Georgi writes:

interconnect fixes for v6.13-rc

This contains two fixes. One fixing a boot error on db410c board when UBSAN
is enabled with clang-19 builds. The other one adds a missing return value
check after devm_kasprintf.

- interconnect: qcom: icc-rpm: Set the count member before accessing the flex array
- interconnect: icc-clk: check return values of devm_kasprintf()

Signed-off-by: Georgi Djakov <djakov@kernel.org>

* tag 'icc-6.13-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
interconnect: icc-clk: check return values of devm_kasprintf()
interconnect: qcom: icc-rpm: Set the count member before accessing the flex array

Changed files
+11 -1
drivers
interconnect
+10
drivers/interconnect/icc-clk.c
··· 116 116 } 117 117 118 118 node->name = devm_kasprintf(dev, GFP_KERNEL, "%s_master", data[i].name); 119 + if (!node->name) { 120 + ret = -ENOMEM; 121 + goto err; 122 + } 123 + 119 124 node->data = &qp->clocks[i]; 120 125 icc_node_add(node, provider); 121 126 /* link to the next node, slave */ ··· 134 129 } 135 130 136 131 node->name = devm_kasprintf(dev, GFP_KERNEL, "%s_slave", data[i].name); 132 + if (!node->name) { 133 + ret = -ENOMEM; 134 + goto err; 135 + } 136 + 137 137 /* no data for slave node */ 138 138 icc_node_add(node, provider); 139 139 onecell->nodes[j++] = node;
+1 -1
drivers/interconnect/qcom/icc-rpm.c
··· 503 503 GFP_KERNEL); 504 504 if (!data) 505 505 return -ENOMEM; 506 + data->num_nodes = num_nodes; 506 507 507 508 qp->num_intf_clks = cd_num; 508 509 for (i = 0; i < cd_num; i++) ··· 598 597 599 598 data->nodes[i] = node; 600 599 } 601 - data->num_nodes = num_nodes; 602 600 603 601 clk_bulk_disable_unprepare(qp->num_intf_clks, qp->intf_clks); 604 602