Skip to content

Commit f971e18

Browse files
committed
nl80211: fix locking in nl80211_set_tx_bitrate_mask()
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>
1 parent 9e2db50 commit f971e18

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

net/wireless/nl80211.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11666,18 +11666,23 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb,
1166611666
struct cfg80211_bitrate_mask mask;
1166711667
struct cfg80211_registered_device *rdev = info->user_ptr[0];
1166811668
struct net_device *dev = info->user_ptr[1];
11669+
struct wireless_dev *wdev = dev->ieee80211_ptr;
1166911670
int err;
1167011671

1167111672
if (!rdev->ops->set_bitrate_mask)
1167211673
return -EOPNOTSUPP;
1167311674

11675+
wdev_lock(wdev);
1167411676
err = nl80211_parse_tx_bitrate_mask(info, info->attrs,
1167511677
NL80211_ATTR_TX_RATES, &mask,
1167611678
dev, true);
1167711679
if (err)
11678-
return err;
11680+
goto out;
1167911681

11680-
return rdev_set_bitrate_mask(rdev, dev, NULL, &mask);
11682+
err = rdev_set_bitrate_mask(rdev, dev, NULL, &mask);
11683+
out:
11684+
wdev_unlock(wdev);
11685+
return err;
1168111686
}
1168211687

1168311688
static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info)

0 commit comments

Comments
 (0)