diff options
| author | Eliad Peller <eliad@wizery.com> | 2012-05-13 18:07:04 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-05 15:21:47 -0400 |
| commit | dac211ec10d268b9d09000093a9fa2ac1773894f (patch) | |
| tree | cd20198268d17aeb5a552bd55679c36bb682b0a0 /net/mac80211/mlme.c | |
| parent | c53f7e150e178b62b9904428ccbe3ae6f3553fdd (diff) | |
| download | blackbird-op-linux-dac211ec10d268b9d09000093a9fa2ac1773894f.tar.gz blackbird-op-linux-dac211ec10d268b9d09000093a9fa2ac1773894f.zip | |
mac80211: fail authentication when AP denied authentication
ieee80211_rx_mgmt_auth() doesn't handle denied authentication
properly - it authenticates the station and waits for association
(for 5 seconds) instead of failing the authentication.
Fix it by destroying auth_data and bailing out instead.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Cc: stable@vger.kernel.org #3.4
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 04c306308987..a2f18b7e6858 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1791,7 +1791,8 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, if (status_code != WLAN_STATUS_SUCCESS) { printk(KERN_DEBUG "%s: %pM denied authentication (status %d)\n", sdata->name, mgmt->sa, status_code); - goto out; + ieee80211_destroy_auth_data(sdata, false); + return RX_MGMT_CFG80211_RX_AUTH; } switch (ifmgd->auth_data->algorithm) { @@ -1813,7 +1814,6 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, } printk(KERN_DEBUG "%s: authenticated\n", sdata->name); - out: ifmgd->auth_data->done = true; ifmgd->auth_data->timeout = jiffies + IEEE80211_AUTH_WAIT_ASSOC; run_again(ifmgd, ifmgd->auth_data->timeout); |
