Commit 6f390908 authored by Ben Greear's avatar Ben Greear Committed by Johannes Berg
Browse files

wireless: Make sure __cfg80211_connect_result always puts bss 



Otherwise, we can leak a bss reference.

Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f1940c57

net/wireless/sme.c

+4 −1
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ static DECLARE_WORK(cfg80211_disconnect_work, disconnect_work); 
 * SME event handling

 */



/* This method must consume bss one way or another */

void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,

			       const u8 *req_ie, size_t req_ie_len,

			       const u8 *resp_ie, size_t resp_ie_len,
@@ -572,8 +573,10 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, 
	ASSERT_WDEV_LOCK(wdev);



	if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION &&

		    wdev->iftype != NL80211_IFTYPE_P2P_CLIENT))

		    wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) {

		cfg80211_put_bss(wdev->wiphy, bss);

		return;

	}



	nl80211_send_connect_result(wiphy_to_dev(wdev->wiphy), dev,

				    bssid, req_ie, req_ie_len,