[PATCH] mac80211: fail authentication when AP denied authentication

[PATCH] mac80211: fail authentication when AP denied authentication

[Eliad Peller]

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>
---
 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 dbd4bd9..2b5235e 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1790,7 +1790,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) {
@@ -1812,7 +1813,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);
-- 
1.7.6.401.g6a319

Re: [PATCH] mac80211: fail authentication when AP denied authentication

[Johannes Berg]

On Sun, 2012-05-13 at 18:07 +0300, Eliad Peller wrote:
> 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.

Acked-by: Johannes Berg <johannes@sipsolutions.net>

Cc: stable now that this code shipped in 3.4? (or didn't it?)

> Signed-off-by: Eliad Peller <eliad@wizery.com>
> ---
>  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 dbd4bd9..2b5235e 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -1790,7 +1790,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) {
> @@ -1812,7 +1813,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);

Re: [PATCH] mac80211: fail authentication when AP denied authentication

[Eliad Peller]

On Tue, May 29, 2012 at 10:18 AM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Sun, 2012-05-13 at 18:07 +0300, Eliad Peller wrote:
>> 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.
>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
>
> Cc: stable now that this code shipped in 3.4? (or didn't it?)
>
yep.
Cc: stable@vger.kernel.org #3.4
(John - i can resend if you prefer)

Eliad.