diff options
| author | Eliad Peller <eliad@wizery.com> | 2014-04-30 16:58:13 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-06 13:40:22 +0400 |
| commit | 7f506377f05d1d087806e42949db49ef52aa397b (patch) | |
| tree | 2902fbb3db2a26d7ef24da45cebae2b065da34c7 | |
| parent | e818ab1909b45811829875764d6a78041f303c09 (diff) | |
| download | linux-7f506377f05d1d087806e42949db49ef52aa397b.tar.xz | |
cfg80211: free sme on connection failures
commit c1fbb258846dfc425507a093922d2d001e54c3ea upstream.
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")
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 20e86a95dc4e..2f844eec9c6d 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -242,7 +242,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); } @@ -646,6 +645,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; } |