cfg80211: require passing BSS struct back to cfg80211_assoc_timeout
Doing so will allow us to hold the BSS (not just ref it) over the association process, thus ensuring that it doesn't time out and gets invisible to the user (e.g. in 'iw wlan0 link'.) This also fixes a leak in mac80211 where it doesn't always release the BSS struct properly in all cases where calling this function. This leak was reported by Ben Greear. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
@@ -131,16 +131,18 @@ void cfg80211_auth_timeout(struct net_device *dev, const u8 *addr)
|
||||
}
|
||||
EXPORT_SYMBOL(cfg80211_auth_timeout);
|
||||
|
||||
void cfg80211_assoc_timeout(struct net_device *dev, const u8 *addr)
|
||||
void cfg80211_assoc_timeout(struct net_device *dev, struct cfg80211_bss *bss)
|
||||
{
|
||||
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
||||
struct wiphy *wiphy = wdev->wiphy;
|
||||
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
|
||||
|
||||
trace_cfg80211_send_assoc_timeout(dev, addr);
|
||||
trace_cfg80211_send_assoc_timeout(dev, bss->bssid);
|
||||
|
||||
nl80211_send_assoc_timeout(rdev, dev, addr, GFP_KERNEL);
|
||||
nl80211_send_assoc_timeout(rdev, dev, bss->bssid, GFP_KERNEL);
|
||||
cfg80211_sme_assoc_timeout(wdev);
|
||||
|
||||
cfg80211_put_bss(wiphy, bss);
|
||||
}
|
||||
EXPORT_SYMBOL(cfg80211_assoc_timeout);
|
||||
|
||||
|
Reference in New Issue
Block a user