[PATCH v16 01/31] firmware: arm_scmi: Harden iterators state parsing
From: Cristian Marussi
Date: Sat Nov 21 2026 - 18:43:37 EST
Add checks in the core multi-part iterators support to detect generally
malformed and inconsistent multi-part replies.
Fixes: 36b6ea0fc6bc ("firmware: arm_scmi: Add iterators for multi-part commands")
Signed-off-by: Cristian Marussi <cristian.marussi@xxxxxxx>
---
drivers/firmware/arm_scmi/driver.c | 10 ++++++++++
drivers/firmware/arm_scmi/protocols.h | 7 +++++++
2 files changed, 17 insertions(+)
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 05092301db29..55d9cc487916 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -1873,11 +1873,21 @@ static int __scmi_iterator_run(void *iter, unsigned int *start, unsigned int *en
if (ret)
return ret;
+ if (i->t->rx.len < SCMI_MULTIPART_REPLY_MIN_SZ) {
+ dev_err(ph->dev, "Invalid multi-part reply.\n");
+ return -EINVAL;
+ }
+
st->rx_len = i->t->rx.len;
ret = iops->update_state(st, i->resp, i->priv);
if (ret)
return ret;
+ if (!st->num_returned && st->num_remaining) {
+ dev_err(ph->dev, "Inconsistent multi-part reply.\n");
+ return -EINVAL;
+ }
+
if (st->num_returned > st->max_resources - st->desc_index) {
dev_err(ph->dev,
"No. of resources can't exceed %d\n",
diff --git a/drivers/firmware/arm_scmi/protocols.h b/drivers/firmware/arm_scmi/protocols.h
index 8583159059e6..c15ec188291a 100644
--- a/drivers/firmware/arm_scmi/protocols.h
+++ b/drivers/firmware/arm_scmi/protocols.h
@@ -33,6 +33,13 @@
#define MSG_SUPPORTS_FASTCHANNEL(x) ((x) & BIT(0))
+/*
+ * Common minimum size required by all the existing standard and vendor
+ * protocols to hold number of returned and remaining items in a multi-part
+ * reply.
+ */
+#define SCMI_MULTIPART_REPLY_MIN_SZ (sizeof(u32))
+
enum scmi_common_cmd {
PROTOCOL_VERSION = 0x0,
PROTOCOL_ATTRIBUTES = 0x1,
--
2.54.0