xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nl80211: fix locking in nl80211_set_tx_bitrate_mask()

Browse Source 
[ Upstream commit f971e1887fdb3ab500c9bebf4b98f62d49a20655 ]

This accesses the wdev's chandef etc., so cannot safely
be used without holding the lock.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20220506102136.06b7205419e6.I2a87c05fbd8bc5e565e84d190d4cfd2e92695a90@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Johannes Berg
2022-05-06 10:21:38 +02:00
committed by Greg Kroah-Hartman
parent efe580c436
commit 3a6dee284f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/wireless/nl80211.c
View File

@@ -11095,18 +11095,23 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb,
struct cfg80211_bitrate_mask mask; struct cfg80211_bitrate_mask mask;
struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct cfg80211_registered_device *rdev = info->user_ptr[0];
struct net_device *dev = info->user_ptr[1]; struct net_device *dev = info->user_ptr[1];
struct wireless_dev *wdev = dev->ieee80211_ptr;
int err; int err;
if (!rdev->ops->set_bitrate_mask) if (!rdev->ops->set_bitrate_mask)
return -EOPNOTSUPP; return -EOPNOTSUPP;
wdev_lock(wdev);
err = nl80211_parse_tx_bitrate_mask(info, info->attrs, err = nl80211_parse_tx_bitrate_mask(info, info->attrs,
NL80211_ATTR_TX_RATES, &mask, NL80211_ATTR_TX_RATES, &mask,
dev); dev);
if (err) if (err)
return err; goto out;
return rdev_set_bitrate_mask(rdev, dev, NULL, &mask); err = rdev_set_bitrate_mask(rdev, dev, NULL, &mask);
out:
wdev_unlock(wdev);
return err;
} }
static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info) static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info)