[PATCH 2/2] firmware: arm_scmi: null pointer dereference in scmi_protocol_table_register()

From: Philip Radford

Date: Mon Nov 16 2026 - 07:32:28 EST


Add checks to avoid dereferencing a null pointer in
scmi_protocol_table_register() and scmi_protocol_table_unregister()

Reported-by: Sashiko <sashiko-bot@xxxxxxxxxx>
Closes: https://sashiko.dev/#/bug/linux-7330d90b-8d81-478a-a227-4aa6f19393ba
Fixes: 2858f6e5f064 ("firmware: arm_scmi: Add multiple protocols registration support")
Signed-off-by: Philip Radford <philip.radford@xxxxxxx>
---
drivers/firmware/arm_scmi/bus.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c
index 25197197db8e..337aa445e42d 100644
--- a/drivers/firmware/arm_scmi/bus.c
+++ b/drivers/firmware/arm_scmi/bus.c
@@ -186,6 +186,9 @@ static int scmi_protocol_table_register(const struct scmi_device_id *id_table)
const struct scmi_device_id *entry;
int ret;

+ if (!id_table)
+ return -ENOENT;
+
for (entry = id_table; entry->name[0]; entry++) {
ret = scmi_protocol_device_request(entry);
if (ret)
@@ -206,8 +209,11 @@ scmi_protocol_table_unregister(const struct scmi_device_id *id_table)
{
const struct scmi_device_id *entry;

- for (entry = id_table; entry->name[0]; entry++)
- scmi_protocol_device_unrequest(entry);
+ if (id_table) {
+ for (entry = id_table; entry->name[0]; entry++)
+ scmi_protocol_device_unrequest(entry);
+ }
+
}

static bool scmi_device_is_transport(const struct scmi_device *scmi_dev)
--
2.34.1