diff options
author | Eliad Peller <eliad@wizery.com> | 2014-04-30 15:58:13 +0300 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-05-05 14:59:00 +0200 |
commit | c1fbb258846dfc425507a093922d2d001e54c3ea (patch) | |
tree | b7ada9451d01e4a7ca880e9952caccb2b1d40269 | |
parent | f4ebddf9abb1fb0add1ce8e9c0bc414f1c17d81d (diff) | |
download | blackbird-obmc-linux-c1fbb258846dfc425507a093922d2d001e54c3ea.tar.gz blackbird-obmc-linux-c1fbb258846dfc425507a093922d2d001e54c3ea.zip |
cfg80211: free sme on connection failures
cfg80211 is notified about connection failures by
__cfg80211_connect_result() call. However, this
function currently does not free cfg80211 sme.
This results in hanging connection attempts in some cases
e.g. when mac80211 authentication attempt is denied,
we have this function call:
ieee80211_rx_mgmt_auth() -> cfg80211_rx_mlme_mgmt() ->
cfg80211_process_auth() -> cfg80211_sme_rx_auth() ->
__cfg80211_connect_result()
but cfg80211_sme_free() is never get called.
Fixes: ceca7b712 ("cfg80211: separate internal SME implementation")
Cc: stable@vger.kernel.org (3.10+)
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | net/wireless/sme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index acdcb4a81817..3546a77033de 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -234,7 +234,6 @@ void cfg80211_conn_work(struct work_struct *work) NULL, 0, NULL, 0, WLAN_STATUS_UNSPECIFIED_FAILURE, false, NULL); - cfg80211_sme_free(wdev); } wdev_unlock(wdev); } @@ -648,6 +647,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, cfg80211_unhold_bss(bss_from_pub(bss)); cfg80211_put_bss(wdev->wiphy, bss); } + cfg80211_sme_free(wdev); return; } |