Commit 96c06950 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: cfg80211: fix MLO connection ownership 



When disconnecting from an MLO connection we need the AP
MLD address, not an arbitrary BSSID. Fix the code to do
that.

Fixes: 9ecff10e ("wifi: nl80211: refactor BSS lookup in nl80211_associate()")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230301115906.4c1b3b18980e.I008f070c7f3b8e8bde9278101ef9e40706a82902@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ce04abc3

net/wireless/nl80211.c

+7 −9
Original line number Diff line number Diff line
@@ -10799,8 +10799,7 @@ static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev, 








static struct cfg80211_bss *nl80211_assoc_bss(struct cfg80211_registered_device *rdev,









					      const u8 *ssid, int ssid_len,









					      struct nlattr **attrs,









					      const u8 **bssid_out)









					      struct nlattr **attrs)









{









	struct ieee80211_channel *chan;









	struct cfg80211_bss *bss;








@@ -10827,7 +10826,6 @@ static struct cfg80211_bss *nl80211_assoc_bss(struct cfg80211_registered_device







	if (!bss)









		return ERR_PTR(-ENOENT);

















	*bssid_out = bssid;









	return bss;









}
















@@ -10837,7 +10835,7 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)







	struct net_device *dev = info->user_ptr[1];









	struct cfg80211_assoc_request req = {};









	struct nlattr **attrs = NULL;









	const u8 *bssid, *ssid;









	const u8 *ap_addr, *ssid;









	unsigned int link_id;









	int err, ssid_len;
















@@ -10974,6 +10972,7 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)







			return -EINVAL;

















		req.ap_mld_addr = nla_data(info->attrs[NL80211_ATTR_MLD_ADDR]);









		ap_addr = req.ap_mld_addr;

















		attrs = kzalloc(attrsize, GFP_KERNEL);









		if (!attrs)








@@ -10999,8 +10998,7 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)







				goto free;









			}









			req.links[link_id].bss =









				nl80211_assoc_bss(rdev, ssid, ssid_len, attrs,









						  &bssid);









				nl80211_assoc_bss(rdev, ssid, ssid_len, attrs);









			if (IS_ERR(req.links[link_id].bss)) {









				err = PTR_ERR(req.links[link_id].bss);









				req.links[link_id].bss = NULL;








@@ -11051,10 +11049,10 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)







		if (req.link_id >= 0)









			return -EINVAL;

















		req.bss = nl80211_assoc_bss(rdev, ssid, ssid_len, info->attrs,









					    &bssid);









		req.bss = nl80211_assoc_bss(rdev, ssid, ssid_len, info->attrs);









		if (IS_ERR(req.bss))









			return PTR_ERR(req.bss);









		ap_addr = req.bss->bssid;









	}

















	err = nl80211_crypto_settings(rdev, info, &req.crypto, 1);








@@ -11067,7 +11065,7 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)







			dev->ieee80211_ptr->conn_owner_nlportid =









				info->snd_portid;









			memcpy(dev->ieee80211_ptr->disconnect_bssid,









			       bssid, ETH_ALEN);









			       ap_addr, ETH_ALEN);









		}

















		wdev_unlock(dev->ieee80211_ptr);