Commit e6e4784b authored by Johannes Berg's avatar Johannes Berg Committed by Jialin Zhang
Browse files

wifi: mac80211: don't parse mbssid in assoc response 

stable inclusion
from stable-v5.10.149
commit 353b5c8d4bea712774ccc631782ed8cc3630528a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0WY

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=353b5c8d4bea712774ccc631782ed8cc3630528a



--------------------------------

This is simply not valid and simplifies the next commit.
I'll make a separate patch for this in the current main
tree as well.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f2de1cb6

net/mac80211/mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -3300,7 +3300,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, 
	}

	capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);

	ieee802_11_parse_elems(pos, len - (pos - (u8 *)mgmt), false, elems,

			       mgmt->bssid, assoc_data->bss->bssid);

			       mgmt->bssid, NULL);



	if (elems->aid_resp)

		aid = le16_to_cpu(elems->aid_resp->aid);
@@ -3709,7 +3709,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
		return;



	ieee802_11_parse_elems(pos, len - (pos - (u8 *)mgmt), false, &elems,

			       mgmt->bssid, assoc_data->bss->bssid);

			       mgmt->bssid, NULL);



	if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY &&

	    elems.timeout_int &&