linux-kernel - [PATCH 04/11] wifi: ath12k: fix endianness handling in QMI firmware memory indication

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20250716075100.1447352-5-alexander.wilhelm@westermo.com>
Date: Wed, 16 Jul 2025 09:50:53 +0200
From: Alexander Wilhelm <alexander.wilhelm@...termo.com>
To: Jeff Johnson <jjohnson@...nel.org>, Bjorn Andersson <andersson@...nel.org>,
        Konrad Dybcio <konradybcio@...nel.org>
Cc: linux-wireless@...r.kernel.org, ath12k@...ts.infradead.org,
        linux-kernel@...r.kernel.org, linux-arm-msm@...r.kernel.org
Subject: [PATCH 04/11] wifi: ath12k: fix endianness handling in QMI firmware memory indication

Ensure proper endianness support for big-endian platforms by correcting
data types in the QMI firmware memory indication request message and its
associated structures as well. Add missing byte swaps wherever these
structures are accessed or modified.

Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")
Signed-off-by: Alexander Wilhelm <alexander.wilhelm@...termo.com>
---
 drivers/net/wireless/ath/ath12k/qmi.c | 15 ++++++++-------
 drivers/net/wireless/ath/ath12k/qmi.h | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index cf05c76cc112..146e9e1c4834 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -3637,18 +3637,19 @@ static void ath12k_qmi_msg_mem_request_cb(struct qmi_handle *qmi_hdl,
 
 	ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi firmware request memory request\n");
 
-	if (msg->mem_seg_len == 0 ||
-	    msg->mem_seg_len > ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01)
+	if (le32_to_cpu(msg->mem_seg_len) == 0 ||
+	    le32_to_cpu(msg->mem_seg_len) > ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01)
 		ath12k_warn(ab, "Invalid memory segment length: %u\n",
-			    msg->mem_seg_len);
+			    le32_to_cpu(msg->mem_seg_len));
 
-	ab->qmi.mem_seg_count = msg->mem_seg_len;
+	ab->qmi.mem_seg_count = le32_to_cpu(msg->mem_seg_len);
 
 	for (i = 0; i < qmi->mem_seg_count ; i++) {
-		ab->qmi.target_mem[i].type = msg->mem_seg[i].type;
-		ab->qmi.target_mem[i].size = msg->mem_seg[i].size;
+		ab->qmi.target_mem[i].type = le32_to_cpu(msg->mem_seg[i].type);
+		ab->qmi.target_mem[i].size = le32_to_cpu(msg->mem_seg[i].size);
 		ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi mem seg type %d size %d\n",
-			   msg->mem_seg[i].type, msg->mem_seg[i].size);
+			   le32_to_cpu(msg->mem_seg[i].type),
+			   le32_to_cpu(msg->mem_seg[i].size));
 	}
 
 	if (test_bit(ATH12K_FLAG_FIXED_MEM_REGION, &ab->dev_flags)) {
diff --git a/drivers/net/wireless/ath/ath12k/qmi.h b/drivers/net/wireless/ath/ath12k/qmi.h
index 026dc33a39d8..92993c85cec9 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.h
+++ b/drivers/net/wireless/ath/ath12k/qmi.h
@@ -327,8 +327,8 @@ struct qmi_wlanfw_ind_register_resp_msg_v01 {
 #define QMI_WLANFW_MAX_STR_LEN_V01                      16
 
 struct qmi_wlanfw_mem_cfg_s_v01 {
-	u64 offset;
-	u32 size;
+	__le64 offset;
+	__le32 size;
 	u8 secure_flag;
 };
 
@@ -344,14 +344,14 @@ enum qmi_wlanfw_mem_type_enum_v01 {
 };
 
 struct qmi_wlanfw_mem_seg_s_v01 {
-	u32 size;
-	enum qmi_wlanfw_mem_type_enum_v01 type;
-	u32 mem_cfg_len;
+	__le32 size;
+	__le32 type;
+	__le32 mem_cfg_len;
 	struct qmi_wlanfw_mem_cfg_s_v01 mem_cfg[QMI_WLANFW_MAX_NUM_MEM_CFG_V01];
 };
 
 struct qmi_wlanfw_request_mem_ind_msg_v01 {
-	u32 mem_seg_len;
+	__le32 mem_seg_len;
 	struct qmi_wlanfw_mem_seg_s_v01 mem_seg[ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01];
 };
 
-- 
2.34.1