Unverified Commit 651a5774 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9180 wifi: wilc1000: fix RCU usage in connect path 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjiang Tu <tujinjiang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/P3LWV7URLZNLDZ7IK6AFZFSBHDL5LZM6/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L9OG 
 
Link:https://gitee.com/openeuler/kernel/pulls/9180

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents e3e16456 e5f3ef32

drivers/net/wireless/microchip/wilc1000/hif.c

+24 −12
Original line number Diff line number Diff line
@@ -361,36 +361,47 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, 
{

	struct wilc_join_bss_param *param;

	struct ieee80211_p2p_noa_attr noa_attr;

	u8 rates_len = 0;

	const u8 *tim_elm, *ssid_elm, *rates_ie, *supp_rates_ie;

	u8 rates_len = 0, ies_len;

	const u8 *ies_data, *tim_elm, *ssid_elm, *rates_ie, *supp_rates_ie;

	const u8 *ht_ie, *wpa_ie, *wmm_ie, *rsn_ie;

	int ret;

	const struct cfg80211_bss_ies *ies = rcu_dereference(bss->ies);

	const struct cfg80211_bss_ies *ies;



	param = kzalloc(sizeof(*param), GFP_KERNEL);

	if (!param)

		return NULL;



	rcu_read_lock();

	ies = rcu_dereference(bss->ies);

	ies_data = kmemdup(ies->data, ies->len, GFP_ATOMIC);

	if (!ies_data) {

		rcu_read_unlock();

		kfree(param);

		return NULL;

	}

	ies_len = ies->len;

	rcu_read_unlock();



	param->beacon_period = cpu_to_le16(bss->beacon_interval);

	param->cap_info = cpu_to_le16(bss->capability);

	param->bss_type = WILC_FW_BSS_TYPE_INFRA;

	param->ch = ieee80211_frequency_to_channel(bss->channel->center_freq);

	ether_addr_copy(param->bssid, bss->bssid);



	ssid_elm = cfg80211_find_ie(WLAN_EID_SSID, ies->data, ies->len);

	ssid_elm = cfg80211_find_ie(WLAN_EID_SSID, ies_data, ies_len);

	if (ssid_elm) {

		if (ssid_elm[1] <= IEEE80211_MAX_SSID_LEN)

			memcpy(param->ssid, ssid_elm + 2, ssid_elm[1]);

	}



	tim_elm = cfg80211_find_ie(WLAN_EID_TIM, ies->data, ies->len);

	tim_elm = cfg80211_find_ie(WLAN_EID_TIM, ies_data, ies_len);

	if (tim_elm && tim_elm[1] >= 2)

		param->dtim_period = tim_elm[3];



	memset(param->p_suites, 0xFF, 3);

	memset(param->akm_suites, 0xFF, 3);



	rates_ie = cfg80211_find_ie(WLAN_EID_SUPP_RATES, ies->data, ies->len);

	rates_ie = cfg80211_find_ie(WLAN_EID_SUPP_RATES, ies_data, ies_len);

	if (rates_ie) {

		rates_len = rates_ie[1];

		if (rates_len > WILC_MAX_RATES_SUPPORTED)
@@ -401,7 +412,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, 


	if (rates_len < WILC_MAX_RATES_SUPPORTED) {

		supp_rates_ie = cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES,

						 ies->data, ies->len);

						 ies_data, ies_len);

		if (supp_rates_ie) {

			u8 ext_rates = supp_rates_ie[1];
@@ -416,11 +427,11 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, 
		}

	}



	ht_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, ies->data, ies->len);

	ht_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, ies_data, ies_len);

	if (ht_ie)

		param->ht_capable = true;



	ret = cfg80211_get_p2p_attr(ies->data, ies->len,

	ret = cfg80211_get_p2p_attr(ies_data, ies_len,

				    IEEE80211_P2P_ATTR_ABSENCE_NOTICE,

				    (u8 *)&noa_attr, sizeof(noa_attr));

	if (ret > 0) {
@@ -444,7 +455,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, 
	}

	wmm_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,

					 WLAN_OUI_TYPE_MICROSOFT_WMM,

					 ies->data, ies->len);

					 ies_data, ies_len);

	if (wmm_ie) {

		struct ieee80211_wmm_param_ie *ie;
@@ -459,13 +470,13 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, 


	wpa_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,

					 WLAN_OUI_TYPE_MICROSOFT_WPA,

					 ies->data, ies->len);

					 ies_data, ies_len);

	if (wpa_ie) {

		param->mode_802_11i = 1;

		param->rsn_found = true;

	}



	rsn_ie = cfg80211_find_ie(WLAN_EID_RSN, ies->data, ies->len);

	rsn_ie = cfg80211_find_ie(WLAN_EID_RSN, ies_data, ies_len);

	if (rsn_ie) {

		int rsn_ie_len = sizeof(struct element) + rsn_ie[1];

		int offset = 8;
@@ -499,6 +510,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, 
			param->akm_suites[i] = crypto->akm_suites[i] & 0xFF;

	}



	kfree(ies_data);

	return (void *)param;

}