| From dac211ec10d268b9d09000093a9fa2ac1773894f Mon Sep 17 00:00:00 2001 |
| From: Eliad Peller <eliad@wizery.com> |
| Date: Sun, 13 May 2012 18:07:04 +0300 |
| Subject: mac80211: fail authentication when AP denied authentication |
| |
| From: Eliad Peller <eliad@wizery.com> |
| |
| commit dac211ec10d268b9d09000093a9fa2ac1773894f upstream. |
| |
| 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> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/mac80211/mlme.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/mac80211/mlme.c |
| +++ b/net/mac80211/mlme.c |
| @@ -1805,7 +1805,8 @@ ieee80211_rx_mgmt_auth(struct ieee80211_ |
| 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) { |
| @@ -1827,7 +1828,6 @@ ieee80211_rx_mgmt_auth(struct ieee80211_ |
| } |
| |
| 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); |
