The patch titled
softmac: fix unbalanced mutex_lock/unlock in ieee80211softmac_wx_set_mlme
has been removed from the -mm tree. Its filename was
softmac-fix-unbalanced-mutex_lock-unlock-in-ieee80211softmac_wx_set_mlme.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: softmac: fix unbalanced mutex_lock/unlock in ieee80211softmac_wx_set_mlme
From: Maxime Austruy <maxime@xxxxxxxxxxxxx>
Found a hang while playing with wpa_supplicant and a zd1211 usb adapter
using linux 2.6.19. The problem is that ieee80211softmac_wx_set_mlme
forgets to release a mutex when mlme->cmd is IW_MLME_DEAUTH. The fix below
allows me to kill wpa_supplicant and to restart it without having to reboot
the machine. FWIW, it seems that the problem was introduced between
2.6.19-rc2 and 2.6.19-rc3 when this function was changed to use a mutex.
Signed-off-by: Maxime Austruy <maxime@xxxxxxxxxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/ieee80211/softmac/ieee80211softmac_wx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN net/ieee80211/softmac/ieee80211softmac_wx.c~softmac-fix-unbalanced-mutex_lock-unlock-in-ieee80211softmac_wx_set_mlme net/ieee80211/softmac/ieee80211softmac_wx.c
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c~softmac-fix-unbalanced-mutex_lock-unlock-in-ieee80211softmac_wx_set_mlme
+++ a/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -495,7 +495,8 @@ ieee80211softmac_wx_set_mlme(struct net_
printk(KERN_DEBUG PFX "wx_set_mlme: we should know the net here...\n");
goto out;
}
- return ieee80211softmac_deauth_req(mac, net, reason);
+ err = ieee80211softmac_deauth_req(mac, net, reason);
+ goto out;
case IW_MLME_DISASSOC:
ieee80211softmac_send_disassoc_req(mac, reason);
mac->associnfo.associated = 0;
_
Patches currently in -mm which might be from maxime@xxxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
