[PATCH 2/3] powercap: arm_scmi: Reject zones hierarchy containing cycles or holes
From: Cristian Marussi
Date: Sun Nov 15 2026 - 06:08:58 EST
While walking the hierarchy of powercap zones received from the SCMI server
bailout with an error if any cycle or hole is detected in the received set
of zones which has to represent a tree or a forest.
Reported-by: Sashiko <sashiko-bot@xxxxxxxxxx>
Closes: https://sashiko.dev/#/bug/linux-6466cd8d-c2b1-43da-8141-bf8bf49a17b1
Closes: https://sashiko.dev/#/bug/linux-4895c0ac-74f4-4860-a006-9f5ef7b0a012
Fixes: 3e767d6850f8 ("powercap: arm_scmi: Remove recursion while parsing zones")
Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx>
Signed-off-by: Cristian Marussi <cristian.marussi@xxxxxxx>
---
drivers/powercap/arm_scmi_powercap.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/powercap/arm_scmi_powercap.c b/drivers/powercap/arm_scmi_powercap.c
index e2270476a98c..dbc9871fc1e2 100644
--- a/drivers/powercap/arm_scmi_powercap.c
+++ b/drivers/powercap/arm_scmi_powercap.c
@@ -22,6 +22,7 @@ static const struct scmi_powercap_proto_ops *powercap_ops;
struct scmi_powercap_zone {
bool registered;
bool invalid;
+ bool visited;
unsigned int height;
struct device *dev;
struct scmi_protocol_handle *ph;
@@ -316,6 +317,7 @@ static int scmi_powercap_register_zone(struct scmi_powercap_root *pr,
spz->info->name, parent ? parent->info->name : "ROOT",
spz->height);
} else {
+ spz->invalid = true;
list_del(&spz->node);
ret = PTR_ERR(z);
dev_err(spz->dev,
@@ -379,8 +381,25 @@ static int scmi_zones_register(struct device *dev,
while (spz) {
struct scmi_powercap_zone *parent;
+ spz->visited = true;
parent = scmi_powercap_get_parent_zone(spz);
if (parent && !parent->registered) {
+ /*
+ * An un-registered parent node is never visited twice:
+ * when that happens it is either a cycle or a hole, i.e.
+ * the attempt to walk again through a node which was already
+ * removed from @scmi_zones since it previously failed to
+ * register.
+ */
+ if (parent->visited) {
+ dev_err(dev, "Found a %s in zone ID %u\n",
+ parent->invalid ? "hole" : "cycle",
+ parent->info->id);
+ scmi_powercap_unregister_all_zones(pr);
+ ret = -EINVAL;
+ reg_zones = 0;
+ goto out;
+ }
zones_stack[sp++] = spz;
spz = parent;
} else {
@@ -392,8 +411,8 @@ static int scmi_zones_register(struct device *dev,
* Bail-out.
*/
dev_err(dev,
- "Failed to register non-leaf zone - ret:%d\n",
- ret);
+ "Failed to register non-leaf zone ID %u - ret:%d\n",
+ spz->info->id, ret);
scmi_powercap_unregister_all_zones(pr);
reg_zones = 0;
goto out;
--
2.54.0