[PATCH 3/8] usb: typec: ucsi: glink: check message data sizes

From: Dmitry Baryshkov
Date: Mon Apr 15 2024 - 22:21:35 EST


The driver gets data from the DSP firmware. Sanitize data size before
reading corresponding message structures.

Fixes: 62b5412b1f4a ("usb: typec: ucsi: add PMIC Glink UCSI driver")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
---
drivers/usb/typec/ucsi/ucsi_glink.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/typec/ucsi/ucsi_glink.c b/drivers/usb/typec/ucsi/ucsi_glink.c
index f7546bb488c3..6be9d89d4a28 100644
--- a/drivers/usb/typec/ucsi/ucsi_glink.c
+++ b/drivers/usb/typec/ucsi/ucsi_glink.c
@@ -223,9 +223,16 @@ static const struct ucsi_operations pmic_glink_ucsi_ops = {
.connector_status = pmic_glink_ucsi_connector_status,
};

-static void pmic_glink_ucsi_read_ack(struct pmic_glink_ucsi *ucsi, const void *data, int len)
+static void pmic_glink_ucsi_read_ack(struct pmic_glink_ucsi *ucsi, const void *data, size_t len)
{
- const struct ucsi_read_buf_resp_msg *resp = data;
+ const struct ucsi_read_buf_resp_msg *resp;
+
+ if (len != sizeof (*resp)) {
+ dev_err_ratelimited(ucsi->dev, "Unexpected read response struct size %zd\n", len);
+ return;
+ }
+
+ resp = data;

if (resp->ret_code)
return;
@@ -234,9 +241,16 @@ static void pmic_glink_ucsi_read_ack(struct pmic_glink_ucsi *ucsi, const void *d
complete(&ucsi->read_ack);
}

-static void pmic_glink_ucsi_write_ack(struct pmic_glink_ucsi *ucsi, const void *data, int len)
+static void pmic_glink_ucsi_write_ack(struct pmic_glink_ucsi *ucsi, const void *data, size_t len)
{
- const struct ucsi_write_buf_resp_msg *resp = data;
+ const struct ucsi_write_buf_resp_msg *resp;
+
+ if (len != sizeof (*resp)) {
+ dev_err_ratelimited(ucsi->dev, "Unexpected write ack struct size %zd\n", len);
+ return;
+ }
+
+ resp = data;

if (resp->ret_code)
return;

--
2.39.2