* [PATCH] mac80211: fix deauth before assoc
@ 2010-06-07 19:50 Johannes Berg
2010-06-07 22:29 ` Miles Lane
2010-06-09 10:56 ` [PATCH v2] " Johannes Berg
0 siblings, 2 replies; 5+ messages in thread
From: Johannes Berg @ 2010-06-07 19:50 UTC (permalink / raw)
To: John Linville; +Cc: Miles Lane, linux-wireless
From: Johannes Berg <johannes.berg@intel.com>
When we receive a deauthentication frame before
having successfully associated, we neither print
a message nor abort assocation. The former makes
it hard to debug, while the latter later causes
a warning in cfg80211 when, as will typically be
the case, association timed out.
This warning was reported by many, e.g. in
https://bugzilla.kernel.org/show_bug.cgi?id=15981,
but I couldn't initially pinpoint it. I verified
the fix by hacking hostapd to send a deauth frame
instead of an association response.
Cc: stable@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/mlme.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
--- wireless-testing.orig/net/mac80211/mlme.c 2010-06-07 21:35:41.000000000 +0200
+++ wireless-testing/net/mac80211/mlme.c 2010-06-07 21:46:00.000000000 +0200
@@ -1695,8 +1695,45 @@ void ieee80211_sta_rx_queued_mgmt(struct
mutex_unlock(&ifmgd->mtx);
if (skb->len >= 24 + 2 /* mgmt + deauth reason */ &&
- (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH)
+ (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH) {
+ struct ieee80211_local *local = sdata->local;
+ struct ieee80211_work *wk;
+
+ mutex_lock(&local->work_mtx);
+ list_for_each_entry(wk, &local->work_list, list) {
+ if (wk->sdata != sdata)
+ continue;
+
+ if (wk->type != IEEE80211_WORK_ASSOC)
+ continue;
+
+ if (memcmp(mgmt->bssid, wk->filter_ta, ETH_ALEN))
+ continue;
+ if (memcmp(mgmt->sa, wk->filter_ta, ETH_ALEN))
+ continue;
+
+ /*
+ * Printing the message only here means we can't
+ * spuriously print it, but it also means that it
+ * won't be printed when the frame comes in before
+ * we even tried to associate or in similar cases.
+ *
+ * Ultimately, I suspect cfg80211 should print the
+ * messages instead.
+ */
+ printk(KERN_DEBUG
+ "%s: deauthenticated from %pM (Reason: %u)\n",
+ sdata->name, mgmt->bssid,
+ le16_to_cpu(mgmt->u.deauth.reason_code));
+
+ list_del_rcu(&wk->list);
+ free_work(wk);
+ break;
+ }
+ mutex_unlock(&local->work_mtx);
+
cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
+ }
}
static void ieee80211_sta_timer(unsigned long data)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mac80211: fix deauth before assoc
2010-06-07 19:50 [PATCH] mac80211: fix deauth before assoc Johannes Berg
@ 2010-06-07 22:29 ` Miles Lane
2010-06-09 10:56 ` [PATCH v2] " Johannes Berg
1 sibling, 0 replies; 5+ messages in thread
From: Miles Lane @ 2010-06-07 22:29 UTC (permalink / raw)
To: Johannes Berg; +Cc: John Linville, linux-wireless
Tested. Looks good.
On Mon, Jun 7, 2010 at 3:50 PM, Johannes Berg <johannes@sipsolutions.net> wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> When we receive a deauthentication frame before
> having successfully associated, we neither print
> a message nor abort assocation. The former makes
> it hard to debug, while the latter later causes
> a warning in cfg80211 when, as will typically be
> the case, association timed out.
>
> This warning was reported by many, e.g. in
> https://bugzilla.kernel.org/show_bug.cgi?id=15981,
> but I couldn't initially pinpoint it. I verified
> the fix by hacking hostapd to send a deauth frame
> instead of an association response.
>
> Cc: stable@kernel.org
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> net/mac80211/mlme.c | 39 ++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 38 insertions(+), 1 deletion(-)
>
> --- wireless-testing.orig/net/mac80211/mlme.c 2010-06-07 21:35:41.000000000 +0200
> +++ wireless-testing/net/mac80211/mlme.c 2010-06-07 21:46:00.000000000 +0200
> @@ -1695,8 +1695,45 @@ void ieee80211_sta_rx_queued_mgmt(struct
> mutex_unlock(&ifmgd->mtx);
>
> if (skb->len >= 24 + 2 /* mgmt + deauth reason */ &&
> - (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH)
> + (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH) {
> + struct ieee80211_local *local = sdata->local;
> + struct ieee80211_work *wk;
> +
> + mutex_lock(&local->work_mtx);
> + list_for_each_entry(wk, &local->work_list, list) {
> + if (wk->sdata != sdata)
> + continue;
> +
> + if (wk->type != IEEE80211_WORK_ASSOC)
> + continue;
> +
> + if (memcmp(mgmt->bssid, wk->filter_ta, ETH_ALEN))
> + continue;
> + if (memcmp(mgmt->sa, wk->filter_ta, ETH_ALEN))
> + continue;
> +
> + /*
> + * Printing the message only here means we can't
> + * spuriously print it, but it also means that it
> + * won't be printed when the frame comes in before
> + * we even tried to associate or in similar cases.
> + *
> + * Ultimately, I suspect cfg80211 should print the
> + * messages instead.
> + */
> + printk(KERN_DEBUG
> + "%s: deauthenticated from %pM (Reason: %u)\n",
> + sdata->name, mgmt->bssid,
> + le16_to_cpu(mgmt->u.deauth.reason_code));
> +
> + list_del_rcu(&wk->list);
> + free_work(wk);
> + break;
> + }
> + mutex_unlock(&local->work_mtx);
> +
> cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
> + }
> }
>
> static void ieee80211_sta_timer(unsigned long data)
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] mac80211: fix deauth before assoc
2010-06-07 19:50 [PATCH] mac80211: fix deauth before assoc Johannes Berg
2010-06-07 22:29 ` Miles Lane
@ 2010-06-09 10:56 ` Johannes Berg
2010-06-09 13:51 ` Miles Lane
1 sibling, 1 reply; 5+ messages in thread
From: Johannes Berg @ 2010-06-09 10:56 UTC (permalink / raw)
To: John Linville; +Cc: Miles Lane, linux-wireless
From: Johannes Berg <johannes.berg@intel.com>
When we receive a deauthentication frame before
having successfully associated, we neither print
a message nor abort assocation. The former makes
it hard to debug, while the latter later causes
a warning in cfg80211 when, as will typically be
the case, association timed out.
This warning was reported by many, e.g. in
https://bugzilla.kernel.org/show_bug.cgi?id=15981,
but I couldn't initially pinpoint it. I verified
the fix by hacking hostapd to send a deauth frame
instead of an association response.
Cc: stable@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
That previous one didn't even apply to the right tree, how did you ever
test it? Or did you just fix up the context?
net/mac80211/mlme.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
--- wireless-testing.orig/net/mac80211/mlme.c 2010-06-09 12:51:33.000000000 +0200
+++ wireless-testing/net/mac80211/mlme.c 2010-06-09 12:54:35.000000000 +0200
@@ -1760,8 +1760,45 @@ static void ieee80211_sta_rx_queued_mgmt
mutex_unlock(&ifmgd->mtx);
if (skb->len >= 24 + 2 /* mgmt + deauth reason */ &&
- (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH)
+ (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH) {
+ struct ieee80211_local *local = sdata->local;
+ struct ieee80211_work *wk;
+
+ mutex_lock(&local->work_mtx);
+ list_for_each_entry(wk, &local->work_list, list) {
+ if (wk->sdata != sdata)
+ continue;
+
+ if (wk->type != IEEE80211_WORK_ASSOC)
+ continue;
+
+ if (memcmp(mgmt->bssid, wk->filter_ta, ETH_ALEN))
+ continue;
+ if (memcmp(mgmt->sa, wk->filter_ta, ETH_ALEN))
+ continue;
+
+ /*
+ * Printing the message only here means we can't
+ * spuriously print it, but it also means that it
+ * won't be printed when the frame comes in before
+ * we even tried to associate or in similar cases.
+ *
+ * Ultimately, I suspect cfg80211 should print the
+ * messages instead.
+ */
+ printk(KERN_DEBUG
+ "%s: deauthenticated from %pM (Reason: %u)\n",
+ sdata->name, mgmt->bssid,
+ le16_to_cpu(mgmt->u.deauth.reason_code));
+
+ list_del_rcu(&wk->list);
+ free_work(wk);
+ break;
+ }
+ mutex_unlock(&local->work_mtx);
+
cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
+ }
out:
kfree_skb(skb);
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] mac80211: fix deauth before assoc
2010-06-09 10:56 ` [PATCH v2] " Johannes Berg
@ 2010-06-09 13:51 ` Miles Lane
2010-06-09 13:53 ` Johannes Berg
0 siblings, 1 reply; 5+ messages in thread
From: Miles Lane @ 2010-06-09 13:51 UTC (permalink / raw)
To: Johannes Berg; +Cc: John Linville, linux-wireless
On Wed, Jun 9, 2010 at 6:56 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> When we receive a deauthentication frame before
> having successfully associated, we neither print
> a message nor abort assocation. The former makes
> it hard to debug, while the latter later causes
> a warning in cfg80211 when, as will typically be
> the case, association timed out.
>
> This warning was reported by many, e.g. in
> https://bugzilla.kernel.org/show_bug.cgi?id=15981,
> but I couldn't initially pinpoint it. I verified
> the fix by hacking hostapd to send a deauth frame
> instead of an association response.
>
> Cc: stable@kernel.org
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> That previous one didn't even apply to the right tree, how did you ever
> test it? Or did you just fix up the context?
patching file net/mac80211/mlme.c
Hunk #1 succeeded at 1722 with fuzz 3 (offset 27 lines).
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] mac80211: fix deauth before assoc
2010-06-09 13:51 ` Miles Lane
@ 2010-06-09 13:53 ` Johannes Berg
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2010-06-09 13:53 UTC (permalink / raw)
To: Miles Lane; +Cc: John Linville, linux-wireless
On Wed, 2010-06-09 at 09:51 -0400, Miles Lane wrote:
> > That previous one didn't even apply to the right tree, how did you ever
> > test it? Or did you just fix up the context?
>
> patching file net/mac80211/mlme.c
> Hunk #1 succeeded at 1722 with fuzz 3 (offset 27 lines).
Oh, so it did actually apply with fuzz, quilt didn't like it here.
johannes
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-06-09 13:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-07 19:50 [PATCH] mac80211: fix deauth before assoc Johannes Berg
2010-06-07 22:29 ` Miles Lane
2010-06-09 10:56 ` [PATCH v2] " Johannes Berg
2010-06-09 13:51 ` Miles Lane
2010-06-09 13:53 ` Johannes Berg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.