mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-02 02:37:05 +08:00
71 lines
2.6 KiB
Diff
71 lines
2.6 KiB
Diff
From 50dc9ce9f80554a88e33b73c30851acf2be36ed3 Mon Sep 17 00:00:00 2001
|
|
From: Karthikeyan Kathirvel <quic_kathirve@quicinc.com>
|
|
Date: Fri, 1 Apr 2022 14:53:09 +0300
|
|
Subject: [PATCH] ath11k: Change max no of active probe SSID and BSSID to fw
|
|
capability
|
|
|
|
The maximum number of SSIDs in a for active probe requests is currently
|
|
reported as 16 (WLAN_SCAN_PARAMS_MAX_SSID) when registering the driver.
|
|
The scan_req_params structure only has the capacity to hold 10 SSIDs.
|
|
This leads to a buffer overflow which can be triggered from
|
|
wpa_supplicant in userspace. When copying the SSIDs into the
|
|
scan_req_params structure in the ath11k_mac_op_hw_scan route, it can
|
|
overwrite the extraie pointer.
|
|
|
|
Firmware supports 16 ssid * 4 bssid, for each ssid 4 bssid combo probe
|
|
request will be sent, so totally 64 probe requests supported. So
|
|
set both max ssid and bssid to 16 and 4 respectively. Remove the
|
|
redundant macros of ssid and bssid.
|
|
|
|
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01300-QCAHKSWPL_SILICONZ-1
|
|
|
|
Signed-off-by: Karthikeyan Kathirvel <quic_kathirve@quicinc.com>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20220329150221.21907-1-quic_kathirve@quicinc.com
|
|
---
|
|
drivers/net/wireless/ath/ath11k/wmi.h | 12 ++----------
|
|
1 file changed, 2 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/wmi.h
|
|
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
|
|
@@ -3089,9 +3089,6 @@ enum scan_dwelltime_adaptive_mode {
|
|
SCAN_DWELL_MODE_STATIC = 4
|
|
};
|
|
|
|
-#define WLAN_SCAN_MAX_NUM_SSID 10
|
|
-#define WLAN_SCAN_MAX_NUM_BSSID 10
|
|
-
|
|
#define WLAN_SSID_MAX_LEN 32
|
|
|
|
struct element_info {
|
|
@@ -3106,7 +3103,6 @@ struct wlan_ssid {
|
|
|
|
#define WMI_IE_BITMAP_SIZE 8
|
|
|
|
-#define WMI_SCAN_MAX_NUM_SSID 0x0A
|
|
/* prefix used by scan requestor ids on the host */
|
|
#define WMI_HOST_SCAN_REQUESTOR_ID_PREFIX 0xA000
|
|
|
|
@@ -3114,10 +3110,6 @@ struct wlan_ssid {
|
|
/* host cycles through the lower 12 bits to generate ids */
|
|
#define WMI_HOST_SCAN_REQ_ID_PREFIX 0xA000
|
|
|
|
-#define WLAN_SCAN_PARAMS_MAX_SSID 16
|
|
-#define WLAN_SCAN_PARAMS_MAX_BSSID 4
|
|
-#define WLAN_SCAN_PARAMS_MAX_IE_LEN 256
|
|
-
|
|
/* Values lower than this may be refused by some firmware revisions with a scan
|
|
* completion with a timedout reason.
|
|
*/
|
|
@@ -3313,8 +3305,8 @@ struct scan_req_params {
|
|
u32 n_probes;
|
|
u32 *chan_list;
|
|
u32 notify_scan_events;
|
|
- struct wlan_ssid ssid[WLAN_SCAN_MAX_NUM_SSID];
|
|
- struct wmi_mac_addr bssid_list[WLAN_SCAN_MAX_NUM_BSSID];
|
|
+ struct wlan_ssid ssid[WLAN_SCAN_PARAMS_MAX_SSID];
|
|
+ struct wmi_mac_addr bssid_list[WLAN_SCAN_PARAMS_MAX_BSSID];
|
|
struct element_info extraie;
|
|
struct element_info htcap;
|
|
struct element_info vhtcap;
|