diff options
author | Ben Greear <greearb@candelatech.com> | 2013-06-19 17:06:25 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-24 09:51:22 -0400 |
commit | 6f390908e58113b9199424749c32a05181ff69d9 (patch) | |
tree | ff97b48c33d3fcc289a7e853e2f7cb0258f75b3a /net/wireless/sme.c | |
parent | f1940c5730f0f0555e42afbcf629be7f7fbbce8e (diff) |
wireless: Make sure __cfg80211_connect_result always puts bss
Otherwise, we can leak a bss reference.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/sme.c')
-rw-r--r-- | net/wireless/sme.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index c0bf781d4fbe..32dac8cdd2e3 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c | |||
@@ -557,6 +557,7 @@ static DECLARE_WORK(cfg80211_disconnect_work, disconnect_work); | |||
557 | * SME event handling | 557 | * SME event handling |
558 | */ | 558 | */ |
559 | 559 | ||
560 | /* This method must consume bss one way or another */ | ||
560 | void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, | 561 | void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, |
561 | const u8 *req_ie, size_t req_ie_len, | 562 | const u8 *req_ie, size_t req_ie_len, |
562 | const u8 *resp_ie, size_t resp_ie_len, | 563 | const u8 *resp_ie, size_t resp_ie_len, |
@@ -572,8 +573,10 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, | |||
572 | ASSERT_WDEV_LOCK(wdev); | 573 | ASSERT_WDEV_LOCK(wdev); |
573 | 574 | ||
574 | if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION && | 575 | if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION && |
575 | wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) | 576 | wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) { |
577 | cfg80211_put_bss(wdev->wiphy, bss); | ||
576 | return; | 578 | return; |
579 | } | ||
577 | 580 | ||
578 | nl80211_send_connect_result(wiphy_to_dev(wdev->wiphy), dev, | 581 | nl80211_send_connect_result(wiphy_to_dev(wdev->wiphy), dev, |
579 | bssid, req_ie, req_ie_len, | 582 | bssid, req_ie, req_ie_len, |