mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-20 19:03:39 +00:00
3affbc1cad
This series is based on * 2020-07-10 ipq6018-ilq-11-0_qca_oem-034672b0676c37b1f4519e5720e18e95fe6236ef Add support for * qsdk kernel/v4.4 * qsdk ethernet subsystem * v5.7 ath11k backport + QualComm staging patches (wlan_ap_1.0) * ath11k-firmware * hostapd/iw/... Feature support * full boot, system detection * sysupgrade to nand * HE support via latest hostapd * driver support for usb, crypto, hwmon, cpufreq, ... Missing * NSS/HW flow offloading - FW blob is not redistributable Using the qsdk v4.4 is an intermediate solution while the vanilla is being tested. Vanilla kernel is almost on feature par. Work has already started to upstream the ethernet and switch drivers. Once complete the target will be fully upstream. Signed-off-by: John Crispin <john@phrozen.org>
64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
commit 0007af89c2635c2f758d35522928a92afa375f85
|
|
Author: Anilkumar Kolli <akolli@codeaurora.org>
|
|
Date: Fri Apr 24 15:06:10 2020 +0530
|
|
|
|
ath11k: fix memory OOB access in qmi_decode
|
|
|
|
diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
|
|
index 39952ea249b1..508e9d2785cf 100644
|
|
--- a/drivers/net/wireless/ath/ath11k/qmi.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
|
|
@@ -2894,21 +2894,21 @@ static const struct qmi_msg_handler ath11k_qmi_msg_handlers[] = {
|
|
.type = QMI_INDICATION,
|
|
.msg_id = QMI_WLFW_REQUEST_MEM_IND_V01,
|
|
.ei = qmi_wlanfw_request_mem_ind_msg_v01_ei,
|
|
- .decoded_size = sizeof(qmi_wlanfw_request_mem_ind_msg_v01_ei),
|
|
+ .decoded_size = sizeof(struct qmi_wlanfw_request_mem_ind_msg_v01),
|
|
.fn = ath11k_qmi_msg_mem_request_cb,
|
|
},
|
|
{
|
|
.type = QMI_INDICATION,
|
|
.msg_id = QMI_WLFW_FW_MEM_READY_IND_V01,
|
|
.ei = qmi_wlanfw_mem_ready_ind_msg_v01_ei,
|
|
- .decoded_size = sizeof(qmi_wlanfw_mem_ready_ind_msg_v01_ei),
|
|
+ .decoded_size = sizeof(struct qmi_wlanfw_fw_mem_ready_ind_msg_v01),
|
|
.fn = ath11k_qmi_msg_mem_ready_cb,
|
|
},
|
|
{
|
|
.type = QMI_INDICATION,
|
|
.msg_id = QMI_WLFW_FW_READY_IND_V01,
|
|
.ei = qmi_wlanfw_fw_ready_ind_msg_v01_ei,
|
|
- .decoded_size = sizeof(qmi_wlanfw_fw_ready_ind_msg_v01_ei),
|
|
+ .decoded_size = sizeof(struct qmi_wlanfw_fw_ready_ind_msg_v01),
|
|
.fn = ath11k_qmi_msg_fw_ready_cb,
|
|
},
|
|
{
|
|
@@ -2916,7 +2916,7 @@ static const struct qmi_msg_handler ath11k_qmi_msg_handlers[] = {
|
|
.msg_id = QMI_WLFW_COLD_BOOT_CAL_DONE_IND_V01,
|
|
.ei = qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei,
|
|
.decoded_size =
|
|
- sizeof(qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei),
|
|
+ sizeof(struct qmi_wlanfw_fw_cold_cal_done_ind_msg_v01),
|
|
.fn = ath11k_qmi_msg_cold_boot_cal_done_cb,
|
|
},
|
|
};
|
|
diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h
|
|
index 02c852aa9031..f279c98645cf 100644
|
|
--- a/drivers/net/wireless/ath/ath11k/qmi.h
|
|
+++ b/drivers/net/wireless/ath/ath11k/qmi.h
|
|
@@ -335,6 +335,14 @@ struct qmi_wlanfw_fw_mem_ready_ind_msg_v01 {
|
|
char placeholder;
|
|
};
|
|
|
|
+struct qmi_wlanfw_fw_ready_ind_msg_v01 {
|
|
+ char placeholder;
|
|
+};
|
|
+
|
|
+struct qmi_wlanfw_fw_cold_cal_done_ind_msg_v01{
|
|
+ char placeholder;
|
|
+};
|
|
+
|
|
#define QMI_WLANFW_CAP_REQ_MSG_V01_MAX_LEN 0
|
|
#define QMI_WLANFW_CAP_RESP_MSG_V01_MAX_LEN 207
|
|
#define QMI_WLANFW_CAP_REQ_V01 0x0024
|