samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Add keymgmt check for 6 GHz in CSA path

Browse Source 
Currently in CSA path if the target channel is 6 GHz, it is not
checking the keymgmt used and allowing the open security to be
configured.
This changes add check for open security for 6 GHz if check_6ghz_security
ini is enabled.

Change-Id: Ie26ff05dc7c7a97a48398c2a81b091f66c6bd39e
CRs-Fixed: 3413618
This commit is contained in:
Sai Pavan Akhil Remella
2023-03-15 15:04:28 +05:30
committed by Madan Koyyalamudi
parent 5f601a78de
commit b74448cea1
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/hdd/src/wlan_hdd_hostapd.c
View File

@@ -3242,6 +3242,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_chan_freq,
QDF_STATUS status;
int ret = 0;
struct hdd_adapter *adapter = (netdev_priv(dev));
struct hdd_beacon_data *beacon = adapter->deflink->session.ap.beacon;
struct hdd_context *hdd_ctx = NULL;
struct hdd_adapter *sta_adapter;
struct hdd_station_ctx *sta_ctx;
@@ -3253,6 +3254,10 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_chan_freq,
bool strict;
uint32_t sta_cnt = 0;
struct ch_params ch_params = {0};
const u8 *rsn_ie, *rsnxe_ie;
struct wlan_crypto_params crypto_params = {0};
bool capable, is_wps;
int32_t keymgmt;
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
ret = wlan_hdd_validate_context(hdd_ctx);
@@ -3282,6 +3287,32 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_chan_freq,
return ret;
}
if (WLAN_REG_IS_6GHZ_CHAN_FREQ(target_chan_freq)) {
rsn_ie = wlan_get_ie_ptr_from_eid(WLAN_EID_RSN,
beacon->tail,
beacon->tail_len);
rsnxe_ie = wlan_get_ie_ptr_from_eid(WLAN_ELEMID_RSNXE,
beacon->tail,
beacon->tail_len);
if (rsn_ie)
wlan_crypto_rsnie_check(&crypto_params, rsn_ie);
keymgmt = wlan_crypto_get_param(sap_ctx->vdev,
WLAN_CRYPTO_PARAM_KEY_MGMT);
if (keymgmt < 0) {
hdd_err_rl("Invalid keymgmt");
return -EINVAL;
}
is_wps = adapter->device_mode == QDF_P2P_GO_MODE ? true : false;
capable = wlan_cm_6ghz_allowed_for_akm(hdd_ctx->psoc, keymgmt,
crypto_params.rsn_caps,
rsnxe_ie, 0, is_wps);
if (!capable) {
hdd_err_rl("6Ghz channel switch not capable");
return -EINVAL;
}
}
sta_adapter = hdd_get_adapter(hdd_ctx, QDF_STA_MODE);
ucfg_policy_mgr_get_conc_rule1(hdd_ctx->psoc, &conc_rule1);
/*