anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: wifi: nl80211: hold wdev mutex in add/mod/del link station

Browse Source 
Since we deal with links, and that requires looking at wdev links,
we should hold the wdev mutex for driver convenience.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Bug: 253289327
Change-Id: I8fe86027eb3a9c4fa32832114c76eb1146088938
(cherry picked from commit 858fd1880ba5fffaacc9bac5c3cd9b0952819208)
Signed-off-by: Kiran Kumar Lokere <quic_klokere@quicinc.com>
This commit is contained in:
Johannes Berg
2022-06-20 15:25:56 +02:00
committed by Todd Kjos
parent b1bdeb8543
commit 7f076a74a7
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/wireless/nl80211.c
View File

@@ -15845,9 +15845,14 @@ nl80211_add_mod_link_station(struct sk_buff *skb, struct genl_info *info,
if (err)
return err;
wdev_lock(dev->ieee80211_ptr);
if (add)
return rdev_add_link_station(rdev, dev, &params);
return rdev_mod_link_station(rdev, dev, &params);
err = rdev_add_link_station(rdev, dev, &params);
else
err = rdev_mod_link_station(rdev, dev, &params);
wdev_unlock(dev->ieee80211_ptr);
return err;
}
static int
@@ -15868,6 +15873,7 @@ nl80211_remove_link_station(struct sk_buff *skb, struct genl_info *info)
struct link_station_del_parameters params = {};
struct cfg80211_registered_device *rdev = info->user_ptr[0];
struct net_device *dev = info->user_ptr[1];
int ret;
if (!rdev->ops->del_link_station)
return -EOPNOTSUPP;
@@ -15879,7 +15885,11 @@ nl80211_remove_link_station(struct sk_buff *skb, struct genl_info *info)
params.mld_mac = nla_data(info->attrs[NL80211_ATTR_MLD_ADDR]);
params.link_id = nla_get_u8(info->attrs[NL80211_ATTR_MLO_LINK_ID]);
return rdev_del_link_station(rdev, dev, &params);
wdev_lock(dev->ieee80211_ptr);
ret = rdev_del_link_station(rdev, dev, &params);
wdev_unlock(dev->ieee80211_ptr);
return ret;
}
#define NL80211_FLAG_NEED_WIPHY 0x01