linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: greearb@candelatech.com
To: linux-wireless@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>
Subject: [PATCH 3/6] wireless:  Make sure __cfg80211_connect_result always puts bss.
Date: Tue, 18 Jun 2013 15:03:34 -0700	[thread overview]
Message-ID: <1371593017-10985-3-git-send-email-greearb@candelatech.com> (raw)
In-Reply-To: <1371593017-10985-1-git-send-email-greearb@candelatech.com>

From: Ben Greear <greearb@candelatech.com>

Otherwise, we can leak a bss reference.

Signed-off-by: Ben Greear <greearb@candelatech.com>
---
 net/wireless/sme.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 6066720..ea2ce33 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -420,6 +420,7 @@ void cfg80211_sme_failed_assoc(struct wireless_dev *wdev)
 	schedule_work(&rdev->conn_work);
 }
 
+/** 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,
@@ -435,11 +436,17 @@ 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)) {
+		if (bss)
+			cfg80211_put_bss(wdev->wiphy, bss);
 		return;
+	}
 
-	if (wdev->sme_state != CFG80211_SME_CONNECTING)
+	if (wdev->sme_state != CFG80211_SME_CONNECTING) {
+		if (bss)
+			cfg80211_put_bss(wdev->wiphy, bss);
 		return;
+	}
 
 	nl80211_send_connect_result(wiphy_to_dev(wdev->wiphy), dev,
 				    bssid, req_ie, req_ie_len,
-- 
1.7.3.4


  parent reply	other threads:[~2013-06-18 22:04 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-18 22:03 [PATCH 1/6] wireless: Add memory usage debugging greearb
2013-06-18 22:03 ` [PATCH 2/6] mac80211: Fix bss ref leak greearb
2013-06-19 10:49   ` Johannes Berg
2013-06-19 10:51     ` Johannes Berg
2013-06-18 22:03 ` greearb [this message]
2013-06-18 22:03 ` [PATCH 4/6] wireless: Check for dangling wdev->current_bss pointer greearb
2013-06-18 22:03 ` [PATCH 5/6] wireless: Fix bss ref count leak in __cfg80211_mlme_assoc greearb
2013-06-18 22:03 ` [PATCH 6/6] wireless: Add comments about bss refcounting greearb
2013-06-19  2:51   ` Julian Calaby
2013-06-19  9:49 ` [PATCH 1/6] wireless: Add memory usage debugging Johannes Berg
2013-06-19 14:22   ` Ben Greear
2013-06-19 14:27     ` Johannes Berg
2013-06-22  8:43 ` Kalle Valo
2013-06-22 15:24   ` Ben Greear

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371593017-10985-3-git-send-email-greearb@candelatech.com \
    --to=greearb@candelatech.com \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).