Skip to contentSkip to conversation

slimbus: qcom-ngd: fix NULL pointer dereference in qcom_slim_ngd_xfer_msg()

PATCH In review Anas Iqbal 2 participants 2 messages Mar 22 – Mar 24

Subsystems (3)
lore
Share & tools
lore

Anas Iqbal

author
#0 lore raw

PATCH 1/1 slimbus: qcom-ngd: fix NULL pointer dereference in qcom_slim_ngd_xfer_msg()

txn->msg is dereferenced without a prior NULL check in qcom_slim_ngd_xfer_msg(), which may lead to a NULL pointer dereference.

Although current callers initialize txn->msg, add a defensive check to prevent potential crashes if a NULL pointer is passed.

Fixes 917809e2280bb ("slimbus: ngd: Add qcom SLIMBus NGD driver")
---
 drivers/slimbus/qcom-ngd-ctrl.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/slimbus/qcom-ngd-ctrl.c +3 -0
index 9aa7218b4e8d..241f5e08b582 100644
@@ -805,6 +805,9 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controller *sctrl,
 	if (txn->dt == SLIM_MSG_DEST_ENUMADDR)
 		return -EPROTONOSUPPORT;
 
+	if (!txn->msg)
+		return -EINVAL;
+
 	if (txn->msg->num_bytes > SLIM_MSGQ_BUF_LEN ||
 			txn->rl > SLIM_MSGQ_BUF_LEN) {
 		dev_err(ctrl->dev, "msg exceeds HW limit\n");
Signature · 1 line
2.43.0
#1 lore raw
Quoted 6 lines · Anas Iqbal

txn->msg is dereferenced without a prior NULL check in qcom_slim_ngd_xfer_msg(), which may lead to a NULL pointer dereference.

Although current callers initialize txn->msg, add a defensive check to prevent potential crashes if a NULL pointer is passed.

Defensive coding is generally not appreciated in the kernel.

Quoted 24 lines
Fixes 917809e2280bb ("slimbus: ngd: Add qcom SLIMBus NGD driver")
---
 drivers/slimbus/qcom-ngd-ctrl.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/slimbus/qcom-ngd-ctrl.c +3 -0
index 9aa7218b4e8d..241f5e08b582 100644
@@ -805,6 +805,9 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controller *sctrl,
 	if (txn->dt == SLIM_MSG_DEST_ENUMADDR)
 		return -EPROTONOSUPPORT;
 
+	if (!txn->msg)
+		return -EINVAL;
+
 	if (txn->msg->num_bytes > SLIM_MSGQ_BUF_LEN ||
 			txn->rl > SLIM_MSGQ_BUF_LEN) {
 		dev_err(ctrl->dev, "msg exceeds HW limit\n");
Signature · 1 line
2.43.0
Signature · 2 lines
With best wishes
Dmitry