github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 00:22:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

interconnect fixes for v6.13-rc

Browse Source 
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>
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJndddGAAoJEIDQzArG2BZjrh8P+weq9Mguj/YqdgiLPbthfhzG
 UxS0pk3Z1Ij4jEEQ7sg79YsObeXJXV43GdbGqDmWmG36OMTIqgZMNT0m6waIax6O
 Bw2a6pmY6fVzJilRiQK+Jpzd6lIQFuUAyotLsATZ7bb+K8gV6CamKfHtAT2sw7Av
 7DygUsWiUsD0CV6iXBHvUkIi+R5jAGymTsS8ogGnJ79zBSiw3E/UKtjkqCp6GyXd
 YYqzkLZ7zD5efY6Sh0X66QP7TKdIqnhw+3YSLoTFMjMRWbirQb8h0iWKFCHbOt4/
 zP4dASOTMSS1RU7NuaDFCsIpNk+w17N/SYgvamfjvIWd3HKCcAku+bxXMMC/c83Q
 B2PenYwNU2CmaVfaHMvUVmijh10guLV6ePCZL0FtZ281om1S14PskIvGCLQMQN3H
 hiAKR1Qn85vzf62zav6aPnNwUuNBg2G4zyEDUNIfDYUckgH/4OYecsXz5Iy+8SmE
 NREEN6qvq4Z59/o6iEQzbZBqL19OUyA5qgPbnB7oh2YmXyPzI4rKKM0IOVW5XTBG
 fWEmB8eRo3HuF/v49g4kh9g8JQud/AB4T+TwJ/3IJM5tIRagGuaIJikoIGrUUqlY
 8uxqFzLF278ma8efN7japDVzg9NocIcXVLLS52pe1Uj7pVYYNjLsCryF21IBLYVI
 HT4pkGSFo7WJHgU6v/ZZ
 =3gAU
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Greg Kroah-Hartman 2025-01-02 16:53:11 +01:00
commit 997bb2d756
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/interconnect/icc-clk.c
View File

@ -116,6 +116,11 @@ struct icc_provider *icc_clk_register(struct device *dev,
}
node->name = devm_kasprintf(dev, GFP_KERNEL, "%s_master", data[i].name);
if (!node->name) {
ret = -ENOMEM;
goto err;
}
node->data = &qp->clocks[i];
icc_node_add(node, provider);
/* link to the next node, slave */
@ -129,6 +134,11 @@ struct icc_provider *icc_clk_register(struct device *dev,
}
node->name = devm_kasprintf(dev, GFP_KERNEL, "%s_slave", data[i].name);
if (!node->name) {
ret = -ENOMEM;
goto err;
}
/* no data for slave node */
icc_node_add(node, provider);
onecell->nodes[j++] = node;

2
drivers/interconnect/qcom/icc-rpm.c
View 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 @@ int qnoc_probe(struct platform_device *pdev)
data->nodes[i] = node;
}
data->num_nodes = num_nodes;
clk_bulk_disable_unprepare(qp->num_intf_clks, qp->intf_clks);