softmac: Fixed handling of deassociation from AP
Subsystems (2)
PATCH 1/1 softmac: Fixed handling of deassociation from AP
From: Ulrich Kunitz <[email protected]>
A deauthentication from the AP doesn't start a reassociation by SoftMAC. To fix this mac->associnfo.associating must be set and the ieee80211softmac_assoc_work function must be scheduled.
---
net/ieee80211/softmac/ieee80211softmac_assoc.c | 14 ++++++++++++-- net/ieee80211/softmac/ieee80211softmac_auth.c | 2 ++ net/ieee80211/softmac/ieee80211softmac_priv.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-)
net/ieee80211/softmac/ieee80211softmac_assoc.c +12 -2
@@ -427,6 +427,17 @@ ieee80211softmac_handle_assoc_response(sreturn 0 ; } +void +ieee80211softmac_try_reassoc (struct ieee80211softmac_device *mac) +{ +unsigned long flags; + +spin_lock_irqsave (&mac->lock, flags); + mac->associnfo.associating =1 ; +schedule_work (&mac->associnfo.work); +spin_unlock_irqrestore (&mac->lock, flags); +} +int ieee80211softmac_handle_disassoc (struct net_device * dev,struct ieee80211_disassoc *disassoc)
@@ -445,8 +456,7 @@ ieee80211softmac_handle_disassoc(struct dprintk(KERN_INFO PFX "got disassoc frame\n");ieee80211softmac_disassoc (mac); -/* try to reassociate */ -schedule_work (&mac->associnfo.work); +ieee80211softmac_try_reassoc (mac);return 0 ; }
net/ieee80211/softmac/ieee80211softmac_auth.c +2 -0
@@ -334,6 +334,8 @@ ieee80211softmac_deauth_from_net(struct/* can't transmit data right now... */ netif_carrier_off (mac->dev);spin_unlock_irqrestore (&mac->lock, flags); + +ieee80211softmac_try_reassoc (mac); }/*
net/ieee80211/softmac/ieee80211softmac_priv.h +2 -0
@@ -238,4 +238,6 @@ void ieee80211softmac_call_events_lockedint ieee80211softmac_notify_internal (struct ieee80211softmac_device *mac,int event,void *event_context,notify_function_ptr fun,void *context,gfp_t gfp_mask); +void ieee80211softmac_try_reassoc (struct ieee80211softmac_device *mac); +#endif /* IEEE80211SOFTMAC_PRIV_H_ */
---
Quoted 23 lines · Larry Finger
From: Ulrich Kunitz <[email protected]>
A deauthentication from the AP doesn't start a reassociation by SoftMAC. To fix this
mac->associnfo.associatingmust be set and theieee80211softmac_assoc_workfunction must be scheduled.Signed-off-by Ulrich Kunitz <[email protected]>Signed-off-by Larry Finger <[email protected]>---
net/ieee80211/softmac/ieee80211softmac_assoc.c | 14 ++++++++++++-- net/ieee80211/softmac/ieee80211softmac_auth.c | 2 ++ net/ieee80211/softmac/ieee80211softmac_priv.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-)Index:
wireless-2.6/net/ieee80211/softmac/ieee80211softmac_assoc.c
===================================================================net/ieee80211/softmac/ieee80211softmac_assoc.c +0
-0@@ -427,6 +427,17 @@ ieee80211softmac_handle_assoc_response(sreturn 0 ; }
net/ieee80211/softmac/ieee80211softmac_assoc.c ieee80211softmac_handle_assoc_response(s · line 439
Quoted 10 lines
net/ieee80211/softmac/ieee80211softmac_assoc.c +10
-0+void +ieee80211softmac_try_reassoc (struct ieee80211softmac_device *mac) +{ +unsigned long flags; + +spin_lock_irqsave (&mac->lock, flags); + mac->associnfo.associating =1 ; +schedule_work (&mac->associnfo.work); +spin_unlock_irqrestore (&mac->lock, flags); +}
All data in mac->associnfo is protected by mac->associnfo->mutex and _not_ mac->lock.
Signature · 1 line
Greetings Michael.
Quoted 2 lines · On 06-12-06 18:52 Michael Buesch wrote:
All data in
mac->associnfois protected bymac->associnfo->mutexand _not_mac->lock.
Are you sure? One can find for instance the following function in ieee80211softmac_assoc.c:
voidieee80211softmac_disassoc(struct ieee80211softmac_device *mac)
{
unsigned long flags;
spin_lock_irqsave(&mac->lock, flags);
if (mac->associnfo.associating)
cancel_delayed_work(&mac->associnfo.timeout);
netif_carrier_off(mac->dev);
mac->associnfo.associated = 0;
mac->associnfo.bssvalid = 0;
mac->associnfo.associating = 0;
ieee80211softmac_init_bss(mac);
ieee80211softmac_call_events_locked(mac, IEEE80211SOFTMAC_EVENT_DISASSOCIATED, NULL);
spin_unlock_irqrestore(&mac->lock, flags);
}Cheers,
Uli
Signature · 1 line
Uli Kunitz
Quoted 6 lines · Ulrich Kunitz
Quoted 2 lines · On 06-12-06 18:52 Michael Buesch wrote:
All data in
mac->associnfois protected bymac->associnfo->mutexand _not_mac->lock.Are you sure?
Yes I am.
Quoted 2 lines
One can find for instance the following function in
ieee80211softmac_assoc.c:
This is not the first time we notice that locking
is completely broken in softmac. ;)
Quoted 23 lines
void
ieee80211softmac_disassoc(struct ieee80211softmac_device *mac){ unsigned long flags; spin_lock_irqsave(&mac->lock, flags); if (mac->associnfo.associating) cancel_delayed_work(&mac->associnfo.timeout); netif_carrier_off(mac->dev); mac->associnfo.associated = 0; mac->associnfo.bssvalid = 0; mac->associnfo.associating = 0; ieee80211softmac_init_bss(mac); ieee80211softmac_call_events_locked(mac, IEEE80211SOFTMAC_EVENT_DISASSOCIATED, NULL); spin_unlock_irqrestore(&mac->lock, flags); }Cheers,
Uli
Signature · 1 line
Greetings Michael.
Quoted 8 lines · On 06-12-06 21:52 Michael Buesch wrote:
Quoted 6 lines · Ulrich Kunitz
Quoted 2 lines · On 06-12-06 18:52 Michael Buesch wrote:
All data in
mac->associnfois protected bymac->associnfo->mutexand _not_mac->lock.Are you sure?
Quoted 7 lines
Yes I am.
Quoted 2 lines
One can find for instance the following function in
ieee80211softmac_assoc.c:This is not the first time we notice that locking
is completely broken in softmac. ;)
So the right thing would be to add another work function (*_start_reassoc_work) which sets the associating variable and calls then *_assoc_work?
Uli
Signature · 1 line
Uli Kunitz
Quoted 15 lines · Ulrich Kunitz
Quoted 13 lines · On 06-12-06 21:52 Michael Buesch wrote:
Quoted 6 lines · Ulrich Kunitz
Quoted 2 lines · On 06-12-06 18:52 Michael Buesch wrote:
All data in
mac->associnfois protected bymac->associnfo->mutexand _not_mac->lock.Are you sure?
Yes I am.
Quoted 2 lines
One can find for instance the following function in
ieee80211softmac_assoc.c:
Quoted 6 lines
Quoted 2 lines
This is not the first time we notice that locking
is completely broken in softmac. ;)So the right thing would be to add another work function (
*_start_reassoc_work) which sets the associating variable and calls then*_assoc_work?
Ah, well. I think the right thing doesn't exist. Even if you replace the lock by the mutex, it's still racy. The whole lock design of softmac is broken and racy and we can't simply fix that with a oneliner.
I'd say, John, apply the original patch as-is, as it does more good than harm.
Basically, I just wanted to point out that this is not race-free. But I think we can live with it.
Signature · 1 line
Greetings Michael.
Quoted 23 lines · Michael Buesch
Quoted 8 lines · Ulrich Kunitz
Quoted 6 lines · On 06-12-06 21:52 Michael Buesch wrote:
Quoted 5 lines · Ulrich Kunitz
Quoted 2 lines · On 06-12-06 18:52 Michael Buesch wrote:
All data in
mac->associnfois protected bymac->associnfo->mutexand _not_mac->lock.Are you sure?
Quoted 8 lines
Quoted 5 lines
Yes I am.
Quoted 1 line
One can find for instance the following function in
ieee80211softmac_assoc.c:This is not the first time we notice that locking
is completely broken in softmac. ;)So the right thing would be to add another work function (
*_start_reassoc_work) which sets the associating variable and calls then*_assoc_work?Ah, well. I think the right thing doesn't exist. Even if you replace the lock by the mutex, it's still racy. The whole lock design of softmac is broken and racy and we can't simply fix that with a oneliner.
Quoted 5 lines
I'd say, John, apply the original patch as-is, as it does more good than harm.
Basically, I just wanted to point out that this is not race-free. But I think we can live with it.
In struct ieee80211softmac_device, there are the following entries:
...
spinlock_t lock;
u8 running; /* SoftMAC started? */
u8 scanning;
struct ieee80211softmac_scaninfo *scaninfo;
struct ieee80211softmac_assoc_info associnfo;
struct ieee80211softmac_bss_info bssinfo;...
In struct ieee80211softmac_assoc_info, we have the following entries:
struct mutex mutex;
struct ieee80211softmac_essid associate_essid;
char bssid[ETH_ALEN];
u8 static_essid;
u8 short_preamble_available;
u8 associating;
u8 associated;
u8 assoc_wait;
u8 bssvalid;
u8 bssfixed;Although it has been amply demonstrated in this forum that I know nothing about locking, it seems to me that the mutex protects only the association data; whereas the spinlock protects more data, but does include the association data. If this is correct, then the original posted code is not wrong, only protecting data unnecessarily.
Please point out the error in my logic. I'm trying to learn.
Larry
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 3 lines · Larry Finger
it seems to
me that the mutex protects only the association data; whereas the spinlock protects more data, but does include the association data.
Nope.
The same way you could argue that the BKL should be taken here, as it's "the global kernel lock which protects everything". But it's simply not true and won't protect anything. ;)
Signature · 1 line
Greetings Michael.