UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

wifi: mac80211: take wiphy lock for MAC addr change 

[ Upstream commit a26787aa13974fb0b3fb42bfeb4256c1b686e305 ]

We want to ensure everything holds the wiphy lock,
so also extend that to the MAC change callback.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Stable-dep-of: 74a7c93f45ab ("wifi: mac80211: fix change_address deadlock during unregister")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Johannes Berg 2023-08-28 14:00:00 +02:00 committed by Greg Kroah-Hartman
parent 77100f2e84
commit be31c9be87
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/mac80211/iface.c
View File

@ -251,9 +251,9 @@ unlock:
return ret; return ret;
} }
static int ieee80211_change_mac(struct net_device *dev, void *addr) static int _ieee80211_change_mac(struct ieee80211_sub_if_data *sdata,
void *addr)
{ {
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct sockaddr *sa = addr; struct sockaddr *sa = addr;
bool check_dup = true; bool check_dup = true;
@ -278,7 +278,7 @@ static int ieee80211_change_mac(struct net_device *dev, void *addr)
if (live) if (live)
drv_remove_interface(local, sdata); drv_remove_interface(local, sdata);
ret = eth_mac_addr(dev, sa); ret = eth_mac_addr(sdata->dev, sa);
if (ret == 0) { if (ret == 0) {
memcpy(sdata->vif.addr, sa->sa_data, ETH_ALEN); memcpy(sdata->vif.addr, sa->sa_data, ETH_ALEN);
@ -294,6 +294,19 @@ static int ieee80211_change_mac(struct net_device *dev, void *addr)
return ret; return ret;
} }
static int ieee80211_change_mac(struct net_device *dev, void *addr)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct ieee80211_local *local = sdata->local;
int ret;
wiphy_lock(local->hw.wiphy);
ret = _ieee80211_change_mac(sdata, addr);
wiphy_unlock(local->hw.wiphy);
return ret;
}
static inline int identical_mac_addr_allowed(int type1, int type2) static inline int identical_mac_addr_allowed(int type1, int type2)
{ {
return type1 == NL80211_IFTYPE_MONITOR || return type1 == NL80211_IFTYPE_MONITOR ||