qmi: sms: Fix possible out-of-bounds read

Commit Message

Ivaylo Dimitrov March 16, 2025, 10:26 a.m. UTC

Fixes: CVE-2024-7537
---
 drivers/qmimodem/sms.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Comments

[e-mail] March 24, 2025, 6 p.m. UTC | #1

Hello:

This patch was applied to ofono.git (master)
by Denis Kenzior <[e-mail]>:

On Sun, 16 Mar 2025 12:26:42 +0200 you wrote:
> Fixes: CVE-2024-7537
> ---
>  drivers/qmimodem/sms.c | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)

Here is the summary with links:
  - qmi: sms: Fix possible out-of-bounds read
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=e6d8d526d507

You are awesome, thank you!

Patch

diff --git a/drivers/qmimodem/sms.c b/drivers/qmimodem/sms.c
index 3e2bef6e..75863480 100644
--- a/drivers/qmimodem/sms.c
+++ b/drivers/qmimodem/sms.c
@@ -442,6 +442,8 @@  static void get_msg_list_cb(struct qmi_result *result, void *user_data)
 	const struct qmi_wms_result_msg_list *list;
 	uint32_t cnt = 0;
 	uint16_t tmp;
+	uint16_t length;
+	size_t msg_size;
 
 	DBG("");
 
@@ -451,7 +453,7 @@  static void get_msg_list_cb(struct qmi_result *result, void *user_data)
 		goto done;
 	}
 
-	list = qmi_result_get(result, QMI_WMS_RESULT_MSG_LIST, NULL);
+	list = qmi_result_get(result, QMI_WMS_RESULT_MSG_LIST, &length);
 	if (list == NULL) {
 		DBG("Err: get msg list empty");
 		goto done;
@@ -460,6 +462,13 @@  static void get_msg_list_cb(struct qmi_result *result, void *user_data)
 	cnt = L_LE32_TO_CPU(list->cnt);
 	DBG("msgs found %d", cnt);
 
+	msg_size = cnt * sizeof(list->msg[0]);
+
+	if (length != sizeof(list->cnt) + msg_size) {
+		DBG("Err: invalid msg list count");
+		goto done;
+	}
+
 	for (tmp = 0; tmp < cnt; tmp++) {
 		DBG("unread type %d ndx %d", list->msg[tmp].type,
 			L_LE32_TO_CPU(list->msg[tmp].ndx));
@@ -473,8 +482,6 @@  static void get_msg_list_cb(struct qmi_result *result, void *user_data)
 
 	/* save list and get 1st msg */
 	if (cnt) {
-		int msg_size = cnt * sizeof(list->msg[0]);
-
 		data->msg_list = l_malloc(sizeof(list->cnt) + msg_size);
 		data->msg_list->cnt = cnt;
 		memcpy(data->msg_list->msg, list->msg, msg_size);